diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/char_dev.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/char_dev.c')
| -rw-r--r-- | fs/char_dev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index f3418f7a6e9d..97986635b641 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/smp_lock.h> | 16 | #include <linux/smp_lock.h> |
| 17 | #include <linux/devfs_fs_kernel.h> | ||
| 18 | #include <linux/seq_file.h> | 17 | #include <linux/seq_file.h> |
| 19 | 18 | ||
| 20 | #include <linux/kobject.h> | 19 | #include <linux/kobject.h> |