summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-22 20:33:41 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-22 20:33:41 +0200
commit83cff839268feb2f31ae7667b9b2b7641dc10575 (patch)
treeaf44e03f24891e454a399d0d2e5dd6e577a1b201
parentb0aedb04eae79372fbe101d98513773d6b89935d (diff)
mediabay: fix build for CONFIG_BLOCK=n
On Tuesday 14 April 2009 20:31:21 Subrata Modak wrote: > Observed the following build error: > --- > CC drivers/macintosh/mediabay.o > In file included from drivers/macintosh/mediabay.c:21: > include/linux/ide.h:605: error: field ‘request_sense_rq’ has incomplete > type > make[2]: *** [drivers/macintosh/mediabay.o] Error 1 > make[1]: *** [drivers/macintosh] Error 2 > make: *** [drivers] Error 2 > --- mediabay shouldn't include <linux/ide.h> unconditionally so remove the superfluous include from mediabay.c (<asm/mediabay.h> will pull <linux/ide.h> in for CONFIG_BLK_DEV_IDE_PMAC=y). Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/macintosh/mediabay.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index d7e46d345d9e..eca55ef185b5 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>