[generic/3.9]: refresh patches against -rc4
[openwrt.git] / target / linux / gemini / patches-3.8 / 002-arm-gemini-fix-platform_register_rtc-prototype.patch
1 --- a/arch/arm/mach-gemini/common.h
2 +++ b/arch/arm/mach-gemini/common.h
3 @@ -18,9 +18,9 @@ extern void gemini_map_io(void);
4  extern void gemini_init_irq(void);
5  extern void gemini_timer_init(void);
6  extern void gemini_gpio_init(void);
7 -extern void platform_register_rtc(void);
8  
9  /* Common platform devices registration functions */
10 +extern int platform_register_rtc(void);
11  extern int platform_register_uart(void);
12  extern int platform_register_pflash(unsigned int size,
13                                     struct mtd_partition *parts,
14 --- a/arch/arm/mach-gemini/devices.c
15 +++ b/arch/arm/mach-gemini/devices.c
16 @@ -17,6 +17,7 @@
17  #include <mach/irqs.h>
18  #include <mach/hardware.h>
19  #include <mach/global_reg.h>
20 +#include "common.h"
21  
22  static struct plat_serial8250_port serial_platform_data[] = {
23         {