Message ID | 4B992408.7040608@oracle.com |
---|---|
State | Accepted |
Commit | f696aa43fadb13a21c4e723fb6e51bf640dd1363 |
Headers | show |
On Thu, 2010-03-11 at 09:10 -0800, Randy Dunlap wrote: > > > > Sorry, it's there, but there are still build errors. > > I will look at those... > > > > > From: Randy Dunlap <randy.dunlap@oracle.com> > > 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>. Folks, sorry for Kconfig mess, I didn't test it well enough it seems... However, I #include the <linux/pci.h> in r852.h, so I don't think it is necessary here. Also, I disagree with the unconditional dependency on nand in sm_ftl. The purpose of CONFIG_SM_FTL_MUSEUM is solely to make it independent of nand. I'll look at how to fix that properly. Best regards, Maxim Levitsky
--- linux-next-20100311.orig/drivers/mtd/nand/Kconfig +++ linux-next-20100311/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 --- linux-next-20100311.orig/drivers/mtd/nand/r852.c +++ linux-next-20100311/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>