diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/mach-gemini/common.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/mach-gemini/common.h')
| -rw-r--r-- | arch/arm/mach-gemini/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-gemini/common.h b/arch/arm/mach-gemini/common.h index 9392834a214f..7670c39acb2f 100644 --- a/arch/arm/mach-gemini/common.h +++ b/arch/arm/mach-gemini/common.h | |||
| @@ -18,6 +18,7 @@ extern void gemini_map_io(void); | |||
| 18 | extern void gemini_init_irq(void); | 18 | extern void gemini_init_irq(void); |
| 19 | extern void gemini_timer_init(void); | 19 | extern void gemini_timer_init(void); |
| 20 | extern void gemini_gpio_init(void); | 20 | extern void gemini_gpio_init(void); |
| 21 | extern void platform_register_rtc(void); | ||
| 21 | 22 | ||
| 22 | /* Common platform devices registration functions */ | 23 | /* Common platform devices registration functions */ |
| 23 | extern int platform_register_uart(void); | 24 | extern int platform_register_uart(void); |