diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-12-06 19:50:25 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-12-06 19:50:25 +0000 |
| commit | 4baeaf652ea434c7482925fd6455927c10164e34 (patch) | |
| tree | 7bba1b0999a440763c10bb2473496354a006a291 | |
| parent | 4636ce7f8a364930e9b47d61dd2f1884a4849657 (diff) | |
| download | upstream-4baeaf652ea434c7482925fd6455927c10164e34.tar.gz upstream-4baeaf652ea434c7482925fd6455927c10164e34.tar.bz2 upstream-4baeaf652ea434c7482925fd6455927c10164e34.zip | |
linux: update 3.0 to 3.0.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29469 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/brcm47xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch | 2 | ||||
| -rw-r--r-- | target/linux/malta/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/orion/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ppc40x/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/realview/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/uml/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/uml/patches-3.0/004-fix_atomic64_32.patch | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 3220afaf4b..dec2412be6 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -29,8 +29,8 @@ endif ifeq ($(LINUX_VERSION),2.6.39.4) LINUX_KERNEL_MD5SUM:=a17c748c2070168f1e784e9605ca043d endif -ifeq ($(LINUX_VERSION),3.0.9) - LINUX_KERNEL_MD5SUM:=71992fa4dfc289a959f9ce266d08d77b +ifeq ($(LINUX_VERSION),3.0.12) + LINUX_KERNEL_MD5SUM:=aa5d56ddc2ef01a61759ceeb0f6b8308 endif ifeq ($(LINUX_VERSION),3.1.1) LINUX_KERNEL_MD5SUM:=4db653798a325f759b8cf49a1b5e6011 diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index ea18b7c772..eb4d9aff9a 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm47xx BOARDNAME:=Broadcom BCM947xx/953xx FEATURES:=squashfs usb pcmcia -LINUX_VERSION:=3.0.9 +LINUX_VERSION:=3.0.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram diff --git a/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch index 3bbadd42a8..49a88ec7e2 100644 --- a/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch @@ -10,7 +10,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -883,3 +885,5 @@ static void __devinit quirk_usb_early_ha +@@ -882,3 +884,5 @@ static void __devinit quirk_usb_early_ha quirk_usb_handoff_xhci(pdev); } DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 03be924846..7495e2fd1a 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.0.9 +LINUX_VERSION:=3.0.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index fcd0bb5eab..cf650fae98 100644 --- a/target/linux/orion/Makefile +++ b/target/linux/orion/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=generic harddisk CFLAGS=-Os -pipe -march=armv5te -mtune=xscale -fno-caller-saves MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.0.9 +LINUX_VERSION:=3.0.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 450849d5d3..6164d9ddc1 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.0.9 +LINUX_VERSION:=3.0.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index be09630254..94de710558 100644 --- a/target/linux/realview/Makefile +++ b/target/linux/realview/Makefile @@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.0.9 +LINUX_VERSION:=3.0.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index f6c4586e28..244d8339d6 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.0.9 +LINUX_VERSION:=3.0.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/patches-3.0/004-fix_atomic64_32.patch b/target/linux/uml/patches-3.0/004-fix_atomic64_32.patch index 6901eee210..fe1e48fc42 100644 --- a/target/linux/uml/patches-3.0/004-fix_atomic64_32.patch +++ b/target/linux/uml/patches-3.0/004-fix_atomic64_32.patch @@ -2,7 +2,7 @@ --- a/arch/um/sys-i386/Makefile +++ b/arch/um/sys-i386/Makefile -@@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.o +@@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.o obj-$(CONFIG_BINFMT_ELF) += elfcore.o |