aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-03-11 12:10:32 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-03-11 12:19:12 -0500
commitf696aa43fadb13a21c4e723fb6e51bf640dd1363 (patch)
tree63eebe873b9047bb7c0d7d0e521a3e992699b702
parente4d64cab99a2d659bf9d6fe9ab67666bceb68d87 (diff)
mtd/nand/r852: fix build for CONFIG_PCI disabled
r852 fails to build when CONFIG_PCI is not enabled since it uses pci_*() calls and is a PCI driver, so it should depend on PCI to prevent build errors. It should also #include <linux/pci.h>. drivers/mtd/nand/r852.c:1053: error: implicit declaration of function 'pci_prepare_to_sleep' drivers/mtd/nand/r852.c:1062: error: implicit declaration of function 'pci_back_from_sleep' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/Kconfig1
-rw-r--r--drivers/mtd/nand/r852.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 6701a00b7a9a..226206e06230 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -105,6 +105,7 @@ config MTD_NAND_IDS
105config MTD_NAND_RICOH 105config MTD_NAND_RICOH
106 tristate "Ricoh xD card reader" 106 tristate "Ricoh xD card reader"
107 default n 107 default n
108 depends on PCI
108 select MTD_SM_COMMON 109 select MTD_SM_COMMON
109 help 110 help
110 Enable support for Ricoh R5C852 xD card reader 111 Enable support for Ricoh R5C852 xD card reader
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index f5a0bc7addea..06f07bb414a8 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -12,6 +12,7 @@
12#include <linux/jiffies.h> 12#include <linux/jiffies.h>
13#include <linux/workqueue.h> 13#include <linux/workqueue.h>
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
15#include <linux/pci.h>
15#include <linux/pci_ids.h> 16#include <linux/pci_ids.h>
16#include <linux/delay.h> 17#include <linux/delay.h>
17#include <asm/byteorder.h> 18#include <asm/byteorder.h>