diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 19:37:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 19:37:35 -0500 |
| commit | 2c6f2db13a2428aa16f54f50232a589ddd5d7d01 (patch) | |
| tree | f12c2f6ce3c6a541f5192aa5a2da400024015fb7 /fs | |
| parent | 12f981f9028da2402c236544c78b8378a278f830 (diff) | |
| parent | 3634634edd49c115da931998b9540bcc17665b05 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
debugfs: fix sparse warnings
Driver core: Fix cleanup when failing device_add().
driver core: Remove dpm_sysfs_remove() from error path of device_add()
PM: fix new mutex-locking bug in the PM core
PM: Do not acquire device semaphores upfront during suspend
kobject: properly initialize ksets
sysfs: CONFIG_SYSFS_DEPRECATED fix
driver core: fix up Kconfig text for CONFIG_SYSFS_DEPRECATED
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/debugfs/inode.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index d26e2826ba5b..e9602d85c11d 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
| @@ -29,10 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #define DEBUGFS_MAGIC 0x64626720 | 30 | #define DEBUGFS_MAGIC 0x64626720 |
| 31 | 31 | ||
| 32 | /* declared over in file.c */ | ||
| 33 | extern struct file_operations debugfs_file_operations; | ||
| 34 | extern struct inode_operations debugfs_link_operations; | ||
| 35 | |||
| 36 | static struct vfsmount *debugfs_mount; | 32 | static struct vfsmount *debugfs_mount; |
| 37 | static int debugfs_mount_count; | 33 | static int debugfs_mount_count; |
| 38 | 34 | ||