The config option CONFIG_GPMC is renamed to CONFIG_OMAP_GPMC as result of this commit: 819f416b86b0d4ad3b6e1ec6375a626aabb96bbd Still, sources continue to use CONFIG_GPMC. Fix it. Signed-off-by: Sanjeev Premi <premi@xxxxxx> --- Did basic boot testing on OMAP3EVM after this change. arch/arm/boards/omap/board-beagle.c | 2 +- arch/arm/boards/omap/board-omap3evm.c | 2 +- arch/arm/boards/omap/board-sdp343x.c | 2 +- arch/arm/boards/phycard-a-l1/pca-a-l1.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c index e5f0f94..5f8c2df 100644 --- a/arch/arm/boards/omap/board-beagle.c +++ b/arch/arm/boards/omap/board-beagle.c @@ -298,7 +298,7 @@ static int beagle_devices_init(void) add_usb_ehci_device(-1, 0x48064700 + 0x100, 0x48064700 + 0x110, &ehci_pdata); #endif /* CONFIG_USB_EHCI_OMAP */ -#ifdef CONFIG_GPMC +#ifdef CONFIG_OMAP_GPMC /* WP is made high and WAIT1 active Low */ gpmc_generic_init(0x10); #endif diff --git a/arch/arm/boards/omap/board-omap3evm.c b/arch/arm/boards/omap/board-omap3evm.c index d2f041a..9e96bc8 100644 --- a/arch/arm/boards/omap/board-omap3evm.c +++ b/arch/arm/boards/omap/board-omap3evm.c @@ -246,7 +246,7 @@ mem_initcall(omap3evm_mem_init); static int omap3evm_init_devices(void) { -#ifdef CONFIG_GPMC +#ifdef CONFIG_OMAP_GPMC /* * WP is made high and WAIT1 active Low */ diff --git a/arch/arm/boards/omap/board-sdp343x.c b/arch/arm/boards/omap/board-sdp343x.c index d486c20..73aefb2 100644 --- a/arch/arm/boards/omap/board-sdp343x.c +++ b/arch/arm/boards/omap/board-sdp343x.c @@ -635,7 +635,7 @@ mem_initcall(sdp3430_mem_init); static int sdp3430_devices_init(void) { -#ifdef CONFIG_GPMC +#ifdef CONFIG_OMAP_GPMC /* WP is made high and WAIT1 active Low */ gpmc_generic_init(0x10); #endif diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phycard-a-l1/pca-a-l1.c index 6fe27b7..7b127f3 100644 --- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c +++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c @@ -286,7 +286,7 @@ static void pcaal1_setup_net_chip(void) static int pcaal1_mem_init(void) { -#ifdef CONFIG_GPMC +#ifdef CONFIG_OMAP_GPMC /* * WP is made high and WAIT1 active Low */ -- 1.7.0.4 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox