diff options
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/brcm47xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch | 4 | ||||
| -rw-r--r-- | target/linux/brcm63xx/Makefile | 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/ppc44x/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/realview/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/uml/Makefile | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e66653f0d2..85bfe81af2 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.17) - LINUX_KERNEL_MD5SUM:=fcdd6a945445336e4cd28b2d195f1fea +ifeq ($(LINUX_VERSION),3.0.18) + LINUX_KERNEL_MD5SUM:=67252770d7009eabe8bac7c26e074f9d endif ifeq ($(LINUX_VERSION),3.1.9) LINUX_KERNEL_MD5SUM:=4e387a49cde20805955c905bc8c311e0 diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 8f3362a870..0212ee6806 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.17 +LINUX_VERSION:=3.0.18 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram diff --git a/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch b/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch index 4837fe740f..0a329c00a3 100644 --- a/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch +++ b/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch @@ -11,7 +11,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c -@@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_ +@@ -74,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_ u32 tmp; /* We do only have one cardbus device behind the bridge. */ @@ -19,4 +19,4 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + if (pc->cardbusmode && (dev > 1)) goto out; - /* Type 0 transaction */ + if (bus == 0) { diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 77e0a39edf..88c4561bf8 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx FEATURES:=squashfs jffs2 usb atm pci pcmcia -LINUX_VERSION:=3.0.17 +LINUX_VERSION:=3.0.18 MAINTAINER:=Florian Fainelli <florian@openwrt.org> include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 50e073148e..6557a85a1a 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.17 +LINUX_VERSION:=3.0.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index f1da2a66ba..ed899a139d 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.17 +LINUX_VERSION:=3.0.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index abbefba784..2efb13a8de 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.17 +LINUX_VERSION:=3.0.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 3d5789e0d7..ed5718764a 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.0.17 +LINUX_VERSION:=3.0.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index 9b980b0267..b720079b5d 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.17 +LINUX_VERSION:=3.0.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 9a6c9dba0f..97bb311651 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.17 +LINUX_VERSION:=3.0.18 include $(INCLUDE_DIR)/target.mk |