diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-07-22 12:51:11 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-07-22 12:51:11 +0000 |
| commit | cc42b1049b5605abe57c49b822a433c27997172d (patch) | |
| tree | dd278cb9e1843efc8e2a06ea03c7d7cf9423f996 /target/linux/gemini | |
| parent | 02198322b93665d332464e942ff848e55cfb0c21 (diff) | |
| download | upstream-cc42b1049b5605abe57c49b822a433c27997172d.tar.gz upstream-cc42b1049b5605abe57c49b822a433c27997172d.tar.bz2 upstream-cc42b1049b5605abe57c49b822a433c27997172d.zip | |
kernel: refresh patches for 4.1
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46441
Diffstat (limited to 'target/linux/gemini')
| -rw-r--r-- | target/linux/gemini/patches-4.1/002-gemini-rtc.patch | 6 | ||||
| -rw-r--r-- | target/linux/gemini/patches-4.1/160-gemini-timers.patch | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/gemini/patches-4.1/002-gemini-rtc.patch b/target/linux/gemini/patches-4.1/002-gemini-rtc.patch index f16e6a32b2..c795569c3e 100644 --- a/target/linux/gemini/patches-4.1/002-gemini-rtc.patch +++ b/target/linux/gemini/patches-4.1/002-gemini-rtc.patch @@ -1,6 +1,6 @@ --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig -@@ -1182,6 +1182,15 @@ config RTC_DRV_BFIN +@@ -1300,6 +1300,15 @@ config RTC_DRV_BFIN This driver can also be built as a module. If so, the module will be called rtc-bfin. @@ -18,7 +18,7 @@ depends on SH_LANDISK --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile -@@ -60,6 +60,7 @@ obj-$(CONFIG_RTC_DRV_EFI) += rtc-efi.o +@@ -65,6 +65,7 @@ obj-$(CONFIG_RTC_DRV_EFI) += rtc-efi.o obj-$(CONFIG_RTC_DRV_EM3027) += rtc-em3027.o obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o @@ -28,7 +28,7 @@ obj-$(CONFIG_RTC_DRV_HYM8563) += rtc-hym8563.o --- a/arch/arm/mach-gemini/common.h +++ b/arch/arm/mach-gemini/common.h -@@ -18,9 +18,9 @@ extern void gemini_map_io(void); +@@ -20,9 +20,9 @@ extern void gemini_map_io(void); extern void gemini_init_irq(void); extern void gemini_timer_init(void); extern void gemini_gpio_init(void); diff --git a/target/linux/gemini/patches-4.1/160-gemini-timers.patch b/target/linux/gemini/patches-4.1/160-gemini-timers.patch index d633eff2cd..d7c8f8643b 100644 --- a/target/linux/gemini/patches-4.1/160-gemini-timers.patch +++ b/target/linux/gemini/patches-4.1/160-gemini-timers.patch @@ -181,10 +181,9 @@ static struct irqaction gemini_timer_irq = { - .name = "Gemini Timer Tick", -- .flags = IRQF_TIMER, -- .handler = gemini_timer_interrupt, + .name = "gemini timer 1", -+ .flags = IRQF_TIMER, + .flags = IRQF_TIMER, +- .handler = gemini_timer_interrupt, + .handler = gemini_timer_intr, }; |