diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/cdrom/cm206.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
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 b6c61bbb20e1..230131163240 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c | |||
| @@ -183,7 +183,6 @@ History: | |||
| 183 | #include <linux/errno.h> /* These include what we really need */ | 183 | #include <linux/errno.h> /* These include what we really need */ |
| 184 | #include <linux/delay.h> | 184 | #include <linux/delay.h> |
| 185 | #include <linux/string.h> | 185 | #include <linux/string.h> |
| 186 | #include <linux/sched.h> | ||
| 187 | #include <linux/interrupt.h> | 186 | #include <linux/interrupt.h> |
| 188 | #include <linux/timer.h> | 187 | #include <linux/timer.h> |
| 189 | #include <linux/cdrom.h> | 188 | #include <linux/cdrom.h> |