diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-18 14:41:16 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-12-18 14:41:16 +0000 |
| commit | 44b989825112c9aedddf7c62e05fc670ebb113a7 (patch) | |
| tree | 9212d538cf94d0a40836d00a14255a37e6b10016 /target/linux/brcm63xx | |
| parent | b9d314aee9edf991c7a4f8df355e88330a253154 (diff) | |
| download | upstream-44b989825112c9aedddf7c62e05fc670ebb113a7.tar.gz upstream-44b989825112c9aedddf7c62e05fc670ebb113a7.tar.bz2 upstream-44b989825112c9aedddf7c62e05fc670ebb113a7.zip | |
kernel: update linux 3.6 to 3.6.11
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34748
Diffstat (limited to 'target/linux/brcm63xx')
| -rw-r--r-- | target/linux/brcm63xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/brcm63xx/patches-3.6/802-rtl8367r_fix_RGMII_support.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 2b092599d0..80de273e11 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.6.10 +LINUX_VERSION:=3.6.11 MAINTAINER:=Florian Fainelli <florian@openwrt.org> include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/patches-3.6/802-rtl8367r_fix_RGMII_support.patch b/target/linux/brcm63xx/patches-3.6/802-rtl8367r_fix_RGMII_support.patch index 285f3f744e..9037d8954a 100644 --- a/target/linux/brcm63xx/patches-3.6/802-rtl8367r_fix_RGMII_support.patch +++ b/target/linux/brcm63xx/patches-3.6/802-rtl8367r_fix_RGMII_support.patch @@ -9,7 +9,7 @@ Subject: [PATCH 6/8] * [rtl8367r] Fix RGMII support --- a/drivers/net/phy/rtl8367.c +++ b/drivers/net/phy/rtl8367.c -@@ -144,6 +144,10 @@ +@@ -146,6 +146,10 @@ #define RTL8367_EXT_RGMXF_TXDELAY_MASK 1 #define RTL8367_EXT_RGMXF_RXDELAY_MASK 0x7 @@ -20,7 +20,7 @@ Subject: [PATCH 6/8] * [rtl8367r] Fix RGMII support #define RTL8367_DI_FORCE_REG(_x) (0x1310 + (_x)) #define RTL8367_DI_FORCE_MODE BIT(12) #define RTL8367_DI_FORCE_NWAY BIT(7) -@@ -892,6 +896,7 @@ static int rtl8367_extif_set_mode(struct +@@ -894,6 +898,7 @@ static int rtl8367_extif_set_mode(struct case RTL8367_EXTIF_MODE_RGMII_33V: REG_WR(smi, RTL8367_CHIP_DEBUG0_REG, 0x0367); REG_WR(smi, RTL8367_CHIP_DEBUG1_REG, 0x7777); |