summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2010-09-16 14:30:37 +0200
committerStefan Roese <sr@denx.de>2010-09-23 09:02:05 +0200
commit098877628888f28f321b8a61a9b0b982a969e415 (patch)
treeb22d513d7476703f01962fa7384cc4fa69e17898 /arch/powerpc
parentb36df561154bdd0a41bb77e09c5575ca2cf48013 (diff)
downloadu-boot-imx-098877628888f28f321b8a61a9b0b982a969e415.zip
u-boot-imx-098877628888f28f321b8a61a9b0b982a969e415.tar.gz
u-boot-imx-098877628888f28f321b8a61a9b0b982a969e415.tar.bz2
ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/cpu/ppc4xx/cpu_init.c2
-rw-r--r--arch/powerpc/cpu/ppc4xx/gpio.c2
-rw-r--r--arch/powerpc/include/asm/ppc4xx-gpio.h (renamed from arch/powerpc/include/asm/gpio.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c
index 7a7954d..6456dc7 100644
--- a/arch/powerpc/cpu/ppc4xx/cpu_init.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c
@@ -25,7 +25,7 @@
#include <watchdog.h>
#include <asm/ppc4xx-emac.h>
#include <asm/processor.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/ppc4xx.h>
#if defined(CONFIG_405GP) || defined(CONFIG_405EP)
diff --git a/arch/powerpc/cpu/ppc4xx/gpio.c b/arch/powerpc/cpu/ppc4xx/gpio.c
index c0d351a..1f9f93a 100644
--- a/arch/powerpc/cpu/ppc4xx/gpio.c
+++ b/arch/powerpc/cpu/ppc4xx/gpio.c
@@ -24,7 +24,7 @@
#include <common.h>
#include <asm/processor.h>
#include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#if defined(CONFIG_SYS_4xx_GPIO_TABLE)
gpio_param_s const gpio_tab[GPIO_GROUP_MAX][GPIO_MAX] = CONFIG_SYS_4xx_GPIO_TABLE;
diff --git a/arch/powerpc/include/asm/gpio.h b/arch/powerpc/include/asm/ppc4xx-gpio.h
index 23e29b1..23e29b1 100644
--- a/arch/powerpc/include/asm/gpio.h
+++ b/arch/powerpc/include/asm/ppc4xx-gpio.h