diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-03-14 16:21:28 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-03-14 16:21:28 +0000 |
commit | f2e91995eaf5f4f1a7cfc85e52d445ac45e36f8a (patch) | |
tree | e8b171f418e6245e9021d465d64048476131c64e /target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch | |
parent | 0193462642bd005e3ab2e36ea45cae2977bc711a (diff) | |
download | upstream-f2e91995eaf5f4f1a7cfc85e52d445ac45e36f8a.tar.gz upstream-f2e91995eaf5f4f1a7cfc85e52d445ac45e36f8a.tar.bz2 upstream-f2e91995eaf5f4f1a7cfc85e52d445ac45e36f8a.zip |
refresh 2.6.32 patches, fix livebox support (#6821)
SVN-Revision: 20204
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch b/target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch index 38b0041850..02354d573c 100644 --- a/target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch +++ b/target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch @@ -20,7 +20,7 @@ EXTRA_CFLAGS += -Werror --- /dev/null +++ b/arch/mips/bcm63xx/boards/board_livebox.c -@@ -0,0 +1,227 @@ +@@ -0,0 +1,223 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive @@ -36,15 +36,14 @@ +#include <linux/mtd/mtd.h> +#include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> ++#include <linux/input.h> ++#include <linux/gpio_buttons.h> +#include <asm/addrspace.h> +#include <bcm63xx_board.h> +#include <bcm63xx_cpu.h> +#include <bcm63xx_regs.h> +#include <bcm63xx_io.h> -+#include <bcm63xx_board.h> +#include <bcm63xx_dev_pci.h> -+#include <bcm63xx_dev_uart.h> -+#include <bcm63xx_dev_wdt.h> +#include <bcm63xx_dev_enet.h> +#include <bcm63xx_dev_pcmcia.h> +#include <bcm63xx_dev_usb_ohci.h> @@ -216,9 +215,6 @@ +{ + u32 val; + -+ bcm63xx_uart_register(); -+ bcm63xx_wdt_register(); -+ + if (board.has_pccard) + bcm63xx_pcmcia_register(); + @@ -242,7 +238,7 @@ + val &= MPI_CSBASE_BASE_MASK; + mtd_resources[0].start = val; + mtd_resources[0].end = 0x1FFFFFFF; -+ ++ + platform_device_register(&mtd_dev); + + return 0; |