From 3feb0ff1607ab3b7dcd36b2347f00c41774464c8 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 22 Aug 2007 14:30:47 -0500 Subject: [MTD] 4xx: Don't build arch/ppc dependent drivers in arch/powerpc These drivers are specific to 4xx support in arch/ppc at the moment. Make sure they don't get built on arch/powerpc. Signed-off-by: Josh Boyer Signed-off-by: Kumar Gala --- drivers/mtd/maps/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/mtd/maps/Kconfig') diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index cc6c7344243..3a6566adcdd 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -354,7 +354,7 @@ config MTD_CFI_FLAGADM config MTD_WALNUT tristate "Flash device mapped on IBM 405GP Walnut" - depends on MTD_JEDECPROBE && WALNUT + depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE help This enables access routines for the flash chips on the IBM 405GP Walnut board. If you have one of these boards and would like to @@ -370,7 +370,7 @@ config MTD_EBONY config MTD_OCOTEA tristate "Flash devices mapped on IBM 440GX Ocotea" - depends on MTD_CFI && OCOTEA + depends on MTD_CFI && OCOTEA && !PPC_MERGE help This enables access routines for the flash chips on the IBM 440GX Ocotea board. If you have one of these boards and would like to -- cgit v1.2.3 From 34a27ffdf59f80fe165f5c56a0be57d55b6da63d Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 22 Aug 2007 22:53:39 -0500 Subject: [MTD] Remove dead maps The tqm834x map Kconfig options depends on TQM834x which does not exist anywhere else in the kernel. The pq2fads map Kconfig/makefile support was removed a while ago but the actual file persisted. Signed-off-by: Kumar Gala --- drivers/mtd/maps/Kconfig | 8 -------- 1 file changed, 8 deletions(-) (limited to 'drivers/mtd/maps/Kconfig') diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 3a6566adcdd..5850ccd0dc0 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -384,14 +384,6 @@ config MTD_REDWOOD Redwood board. If you have one of these boards and would like to use the flash chips on it, say 'Y'. -config MTD_TQM834x - tristate "Flash device mapped on TQ Components TQM834x Boards" - depends on MTD_CFI && TQM834x - help - This enables access routines for the flash chips on the - TQ Components TQM834x boards. If you have one of these boards - and would like to use the flash chips on it, say 'Y'. - config MTD_OCELOT tristate "Momenco Ocelot boot flash device" depends on MOMENCO_OCELOT -- cgit v1.2.3