mtd/nand/r852: fix build for CONFIG_PCI disabled

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=f696aa43fadb13a21c4e723fb6e51bf640dd1363
Commit:     f696aa43fadb13a21c4e723fb6e51bf640dd1363
Parent:     e4d64cab99a2d659bf9d6fe9ab67666bceb68d87
Author:     Randy Dunlap <randy.dunlap at oracle.com>
AuthorDate: Thu Mar 11 09:10:32 2010 -0800
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Thu Mar 11 09:19:12 2010 -0800

    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 at oracle.com>
    Cc: Maxim Levitsky <maximlevitsky at gmail.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/Kconfig |    1 +
 drivers/mtd/nand/r852.c  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 6701a00..226206e 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -105,6 +105,7 @@ config MTD_NAND_IDS
 config MTD_NAND_RICOH
 	tristate "Ricoh xD card reader"
 	default n
+	depends on PCI
 	select MTD_SM_COMMON
 	help
 	  Enable support for Ricoh R5C852 xD card reader
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index f5a0bc7..06f07bb 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -12,6 +12,7 @@
 #include <linux/jiffies.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
+#include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/delay.h>
 #include <asm/byteorder.h>