diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-04-22 18:38:45 (GMT) |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-04-22 18:38:45 (GMT) |
| commit | 24fc484ab2291d242d1d6bfb5ca5b781061a8578 (patch) | |
| tree | ea1d38f9ee40fd3b680f030d28b8aebb0f84b789 /drivers/macintosh/mediabay.c | |
| parent | 2ecf0a57c60dcb588f310d94412118e15c510532 (diff) | |
| parent | 83cff839268feb2f31ae7667b9b2b7641dc10575 (diff) | |
| download | linux-24fc484ab2291d242d1d6bfb5ca5b781061a8578.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/macintosh/mediabay.c')
| -rw-r--r-- | drivers/macintosh/mediabay.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index d7e46d3..eca55ef 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c @@ -18,7 +18,6 @@ #include <linux/timer.h> #include <linux/stddef.h> #include <linux/init.h> -#include <linux/ide.h> #include <linux/kthread.h> #include <linux/mutex.h> #include <asm/prom.h> |