Commit e0278a2f authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linuxusb.bkbits.net/linus-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents 05124d3e 7bfd4a3d
...@@ -396,7 +396,7 @@ static struct super_block *pcihpfs_get_sb(struct file_system_type *fs_type, ...@@ -396,7 +396,7 @@ static struct super_block *pcihpfs_get_sb(struct file_system_type *fs_type,
static struct file_system_type pcihpfs_type = { static struct file_system_type pcihpfs_type = {
owner: THIS_MODULE, owner: THIS_MODULE,
name: "pchihpfs", name: "pcihpfs",
get_sb: pcihpfs_get_sb, get_sb: pcihpfs_get_sb,
fs_flags: FS_LITTER, fs_flags: FS_LITTER,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment