diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-03-11 09:10:32 -0800 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-03-11 09:19:12 -0800 |
| commit | f696aa43fadb13a21c4e723fb6e51bf640dd1363 (patch) | |
| tree | 63eebe873b9047bb7c0d7d0e521a3e992699b702 | |
| parent | e4d64cab99a2d659bf9d6fe9ab67666bceb68d87 (diff) | |
| download | linux-3.10-f696aa43fadb13a21c4e723fb6e51bf640dd1363.tar.gz linux-3.10-f696aa43fadb13a21c4e723fb6e51bf640dd1363.tar.bz2 linux-3.10-f696aa43fadb13a21c4e723fb6e51bf640dd1363.zip | |
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/Kconfig | 1 | ||||
| -rw-r--r-- | 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 6701a00b7a9..226206e0623 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 f5a0bc7adde..06f07bb414a 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> |