diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-20 14:43:29 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-20 14:43:29 -0800 |
| commit | e3833654a2d7a762130e15d17844104be13b302f (patch) | |
| tree | 05706ba3bddc0676bb8f38ddd59768d0c0efd0be /usb | |
| parent | e20806568a096de6fccec9d50d85ebef49ac150e (diff) | |
| download | patches-e3833654a2d7a762130e15d17844104be13b302f.tar.gz | |
fix up build error when usbfs2 is built into the kernel
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usbfs2.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/usb/usbfs2.patch b/usb/usbfs2.patch index b3802d8cf489b..64b1b9b5fb771 100644 --- a/usb/usbfs2.patch +++ b/usb/usbfs2.patch @@ -3,8 +3,8 @@ drivers/usb/Makefile | 2 drivers/usb/usbfs2/Kconfig | 7 drivers/usb/usbfs2/Makefile | 5 - drivers/usb/usbfs2/usbfs2.c | 343 ++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 359 insertions(+) + drivers/usb/usbfs2/usbfs2.c | 345 ++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 361 insertions(+) --- /dev/null +++ gregkh-2.6/drivers/usb/usbfs2/Makefile @@ -48,7 +48,7 @@ + Most users want to say Y here. --- /dev/null +++ gregkh-2.6/drivers/usb/usbfs2/usbfs2.c -@@ -0,0 +1,343 @@ +@@ -0,0 +1,345 @@ +/* + * usbfs2.c - usbfs2 + * @@ -236,6 +236,7 @@ + return error; +} + ++#if 0 +/** + * securityfs_create_file - create a file in the securityfs filesystem + * @@ -265,7 +266,7 @@ + * NULL or !NULL instead as to eliminate the need for #ifdef in the calling + * code. + */ -+struct dentry *securityfs_create_file(const char *name, mode_t mode, ++static struct dentry *securityfs_create_file(const char *name, mode_t mode, + struct dentry *parent, void *data, + struct file_operations *fops) +{ @@ -318,7 +319,7 @@ + * NULL or !NULL instead as to eliminate the need for #ifdef in the calling + * code. + */ -+struct dentry *securityfs_create_dir(const char *name, struct dentry *parent) ++static struct dentry *securityfs_create_dir(const char *name, struct dentry *parent) +{ + return securityfs_create_file(name, + S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO, @@ -339,7 +340,7 @@ + * removed, no automatic cleanup of files will happen when a module is + * removed, you are responsible here. + */ -+void securityfs_remove(struct dentry *dentry) ++static void securityfs_remove(struct dentry *dentry) +{ + struct dentry *parent; + @@ -363,6 +364,7 @@ + mutex_unlock(&parent->d_inode->i_mutex); + simple_release_fs(&mount, &mount_count); +} ++#endif + +static decl_subsys(usbfs2, NULL, NULL); + |