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 /drivers/cdrom/mcdx.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/cdrom/mcdx.c')
| -rw-r--r-- | drivers/cdrom/mcdx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c index 0f6e7aab8d2c..788c7a0b2fe3 100644 --- a/drivers/cdrom/mcdx.c +++ b/drivers/cdrom/mcdx.c | |||
| @@ -74,7 +74,6 @@ static const char *mcdx_c_version | |||
| 74 | #include <linux/major.h> | 74 | #include <linux/major.h> |
| 75 | #define MAJOR_NR MITSUMI_X_CDROM_MAJOR | 75 | #define MAJOR_NR MITSUMI_X_CDROM_MAJOR |
| 76 | #include <linux/blkdev.h> | 76 | #include <linux/blkdev.h> |
| 77 | #include <linux/devfs_fs_kernel.h> | ||
| 78 | 77 | ||
| 79 | #include "mcdx.h" | 78 | #include "mcdx.h" |
| 80 | 79 | ||