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/cm206.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/cdrom/cm206.c')
| -rw-r--r-- | drivers/cdrom/cm206.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index f43a988dd413..4ee288688fed 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c | |||
| @@ -187,7 +187,6 @@ History: | |||
| 187 | #include <linux/interrupt.h> | 187 | #include <linux/interrupt.h> |
| 188 | #include <linux/timer.h> | 188 | #include <linux/timer.h> |
| 189 | #include <linux/cdrom.h> | 189 | #include <linux/cdrom.h> |
| 190 | #include <linux/devfs_fs_kernel.h> | ||
| 191 | #include <linux/ioport.h> | 190 | #include <linux/ioport.h> |
| 192 | #include <linux/mm.h> | 191 | #include <linux/mm.h> |
| 193 | #include <linux/slab.h> | 192 | #include <linux/slab.h> |