From 6830f81fe5eda1c5eea1ca9bb5f44653403b1925 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 11 Mar 2010 09:10:32 -0800
Subject: [PATCH] --- yaml --- r: 195912 b: refs/heads/master c:
 f696aa43fadb13a21c4e723fb6e51bf640dd1363 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mtd/nand/Kconfig | 1 +
 trunk/drivers/mtd/nand/r852.c  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 66a758c802d8..70bb2dde9c78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4d64cab99a2d659bf9d6fe9ab67666bceb68d87
+refs/heads/master: f696aa43fadb13a21c4e723fb6e51bf640dd1363
diff --git a/trunk/drivers/mtd/nand/Kconfig b/trunk/drivers/mtd/nand/Kconfig
index 6701a00b7a9a..226206e06230 100644
--- a/trunk/drivers/mtd/nand/Kconfig
+++ b/trunk/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/trunk/drivers/mtd/nand/r852.c b/trunk/drivers/mtd/nand/r852.c
index f5a0bc7addea..06f07bb414a8 100644
--- a/trunk/drivers/mtd/nand/r852.c
+++ b/trunk/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>