diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-15 16:00:41 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-15 16:00:41 +0000 |
commit | 554772a66547afa10bc7fc3040f3bf9259728c60 (patch) | |
tree | 0e13685d463ed4e6c63782bdfa6a4258ba154c99 /target/linux/brcm2708 | |
parent | 57c6730ed623e347ed8eae420e5e2fa6e67ebecc (diff) | |
download | upstream-554772a66547afa10bc7fc3040f3bf9259728c60.tar.gz upstream-554772a66547afa10bc7fc3040f3bf9259728c60.tar.bz2 upstream-554772a66547afa10bc7fc3040f3bf9259728c60.zip |
kernel: update 3.10 to 3.10.12
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38000
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r-- | target/linux/brcm2708/Makefile | 2 | ||||
-rw-r--r-- | target/linux/brcm2708/patches-3.10/002-Main-bcm2708-linux-port.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index 0a262488a1..ad0d1fb806 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -13,7 +13,7 @@ BOARDNAME:=Broadcom BCM2708/BCM2835 FEATURES:=ext4 audio usb usbgadget display gpio MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.10.10 +LINUX_VERSION:=3.10.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835 diff --git a/target/linux/brcm2708/patches-3.10/002-Main-bcm2708-linux-port.patch b/target/linux/brcm2708/patches-3.10/002-Main-bcm2708-linux-port.patch index 9800298aa0..baab5fbde5 100644 --- a/target/linux/brcm2708/patches-3.10/002-Main-bcm2708-linux-port.patch +++ b/target/linux/brcm2708/patches-3.10/002-Main-bcm2708-linux-port.patch @@ -2079,7 +2079,7 @@ +ENDPROC(__FIQ_Branch) --- a/arch/arm/kernel/fiq.c +++ b/arch/arm/kernel/fiq.c -@@ -145,6 +145,7 @@ void disable_fiq(int fiq) +@@ -141,6 +141,7 @@ void disable_fiq(int fiq) EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ EXPORT_SYMBOL(__get_fiq_regs); /* defined in fiqasm.S */ |