diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 3 | ||||
-rw-r--r-- | arch/h8300/include/asm/gpio-internal.h (renamed from arch/h8300/include/asm/gpio.h) | 0 | ||||
-rw-r--r-- | arch/h8300/platform/h8300h/irq.c | 2 | ||||
-rw-r--r-- | arch/h8300/platform/h8s/irq.c | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h index 3ba4d8f8073b..9605bf227df9 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h +++ b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | |||
@@ -67,6 +67,9 @@ extern int nmk_gpio_get_mode(int gpio); | |||
67 | extern void nmk_gpio_wakeups_suspend(void); | 67 | extern void nmk_gpio_wakeups_suspend(void); |
68 | extern void nmk_gpio_wakeups_resume(void); | 68 | extern void nmk_gpio_wakeups_resume(void); |
69 | 69 | ||
70 | extern void nmk_gpio_clocks_enable(void); | ||
71 | extern void nmk_gpio_clocks_disable(void); | ||
72 | |||
70 | extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up); | 73 | extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up); |
71 | 74 | ||
72 | /* | 75 | /* |
diff --git a/arch/h8300/include/asm/gpio.h b/arch/h8300/include/asm/gpio-internal.h index a714f0c0efbc..a714f0c0efbc 100644 --- a/arch/h8300/include/asm/gpio.h +++ b/arch/h8300/include/asm/gpio-internal.h | |||
diff --git a/arch/h8300/platform/h8300h/irq.c b/arch/h8300/platform/h8300h/irq.c index e977345105d7..bc4f51bceef5 100644 --- a/arch/h8300/platform/h8300h/irq.c +++ b/arch/h8300/platform/h8300h/irq.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <asm/traps.h> | 11 | #include <asm/traps.h> |
12 | #include <asm/irq.h> | 12 | #include <asm/irq.h> |
13 | #include <asm/io.h> | 13 | #include <asm/io.h> |
14 | #include <asm/gpio.h> | 14 | #include <asm/gpio-internal.h> |
15 | #include <asm/regs306x.h> | 15 | #include <asm/regs306x.h> |
16 | 16 | ||
17 | const int __initdata h8300_saved_vectors[] = { | 17 | const int __initdata h8300_saved_vectors[] = { |
diff --git a/arch/h8300/platform/h8s/irq.c b/arch/h8300/platform/h8s/irq.c index 8182f041f829..7b5f29febc07 100644 --- a/arch/h8300/platform/h8s/irq.c +++ b/arch/h8300/platform/h8s/irq.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <asm/traps.h> | 14 | #include <asm/traps.h> |
15 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
16 | #include <asm/io.h> | 16 | #include <asm/io.h> |
17 | #include <asm/gpio.h> | 17 | #include <asm/gpio-internal.h> |
18 | #include <asm/regs267x.h> | 18 | #include <asm/regs267x.h> |
19 | 19 | ||
20 | /* saved vector list */ | 20 | /* saved vector list */ |