From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 1 Nov 2012 09:33:13 +0000 (+0800)
Subject: rk: sram: fix gcc warning: extra tokens at end of #else directive and fix for rk3066b
X-Git-Tag: firefly_0821_release~8290
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa0e8730dca5c2e856edbe630072fd00740352a6;p=firefly-linux-kernel-4.4.55.git

rk: sram: fix gcc warning: extra tokens at end of #else directive and fix for rk3066b
---

diff --git a/arch/arm/plat-rk/sram.c b/arch/arm/plat-rk/sram.c
index c4a3d8e0a5c6..863cfad94d67 100755
--- a/arch/arm/plat-rk/sram.c
+++ b/arch/arm/plat-rk/sram.c
@@ -107,8 +107,10 @@ void __sramfunc sram_printhex(unsigned int hex)
 struct sram_gpio_data __sramdata pmic_sleep;
 #if defined(CONFIG_ARCH_RK2928)
 static void __iomem *gpio_base[] = {RK2928_GPIO0_BASE, RK2928_GPIO1_BASE, RK2928_GPIO2_BASE, RK2928_GPIO3_BASE};
-#else if defined(CONFIG_ARCH_RK30)
-static void __iomem *gpio_base[] = {RK30_GPIO0_BASE, RK30_GPIO1_BASE, RK30_GPIO2_BASE, RK30_GPIO3_BASE,RK30_GPIO4_BASE,RK30_GPIO6_BASE};
+#elif defined(CONFIG_ARCH_RK3066B)
+static void __iomem *gpio_base[] = {RK30_GPIO0_BASE, RK30_GPIO1_BASE, RK30_GPIO2_BASE, RK30_GPIO3_BASE};
+#elif defined(CONFIG_ARCH_RK30)
+static void __iomem *gpio_base[] = {RK30_GPIO0_BASE, RK30_GPIO1_BASE, RK30_GPIO2_BASE, RK30_GPIO3_BASE, RK30_GPIO4_BASE, RK30_GPIO6_BASE};
 #endif
 
 int sram_gpio_init(int gpio, struct sram_gpio_data *data)