diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-10-17 14:09:04 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-10-17 14:09:04 +0000 |
commit | 265bf2ccb02510d077bc446c26babd757dab3620 (patch) | |
tree | ce4ebe3c3726471ec19374928b699f449d20f28a /target/linux | |
parent | 9f4c51acb78a623c76e0d46816ac3eb94cbf8823 (diff) | |
download | upstream-265bf2ccb02510d077bc446c26babd757dab3620.tar.gz upstream-265bf2ccb02510d077bc446c26babd757dab3620.tar.bz2 upstream-265bf2ccb02510d077bc446c26babd757dab3620.zip |
refresh patches
Signed-off-by: Miguel Gaio <miguel.gaio@efixo.com>
SVN-Revision: 23502
Diffstat (limited to 'target/linux')
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.35/240-spi.patch b/target/linux/brcm63xx/patches-2.6.35/240-spi.patch index 800b228116..835c0df2bc 100644 --- a/target/linux/brcm63xx/patches-2.6.35/240-spi.patch +++ b/target/linux/brcm63xx/patches-2.6.35/240-spi.patch @@ -936,7 +936,7 @@ obj-y += boards/ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -31,6 +31,7 @@ +@@ -33,6 +33,7 @@ #include <bcm63xx_dev_usb_ohci.h> #include <bcm63xx_dev_usb_ehci.h> #include <bcm63xx_dev_usb_udc.h> @@ -944,9 +944,9 @@ #include <board_bcm963xx.h> #define PFX "board_bcm963xx: " -@@ -1557,6 +1558,9 @@ int __init board_register_devices(void) - if (board.has_udc0) - bcm63xx_udc_register(); +@@ -1596,6 +1597,9 @@ int __init board_register_devices(void) + if (board.num_spis) + spi_register_board_info(board.spis, board.num_spis); + if (!BCMCPU_IS_6345()) + bcm63xx_spi_register(); diff --git a/target/linux/brcm63xx/patches-2.6.35/250-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-2.6.35/250-6358-enet1-external-mii-clk.patch index 07b97311f0..bf07d359c2 100644 --- a/target/linux/brcm63xx/patches-2.6.35/250-6358-enet1-external-mii-clk.patch +++ b/target/linux/brcm63xx/patches-2.6.35/250-6358-enet1-external-mii-clk.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1453,6 +1453,8 @@ void __init board_prom_init(void) +@@ -1486,6 +1486,8 @@ void __init board_prom_init(void) if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G3_EXT_MII | GPIO_MODE_6348_G0_EXT_MII; diff --git a/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch b/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch index f9667b2973..2c336c86c3 100644 --- a/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch +++ b/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -53,6 +53,13 @@ static unsigned int mac_addr_used; +@@ -49,6 +49,13 @@ static unsigned int mac_addr_used; static struct board_info board; /* @@ -14,7 +14,7 @@ * known 6338 boards */ #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1403,6 +1410,7 @@ void __init board_prom_init(void) +@@ -1420,6 +1427,7 @@ void __init board_prom_init(void) /* extract nvram data */ memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram)); |