aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.28
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2009-03-17 16:45:23 +0000
committerMichael Büsch <mb@bu3sch.de>2009-03-17 16:45:23 +0000
commit7ddf197c26734222dc7586645544e4d1b7086aed (patch)
tree12080461e9ff7b72f218d84bdc7298c64308d4b6 /target/linux/brcm47xx/patches-2.6.28
parentb6d7bfc94f79463a9eb7f3e4635e2998f77afff2 (diff)
downloadupstream-7ddf197c26734222dc7586645544e4d1b7086aed.tar.gz
upstream-7ddf197c26734222dc7586645544e4d1b7086aed.tar.bz2
upstream-7ddf197c26734222dc7586645544e4d1b7086aed.zip
bcm47xx: Fix compilation on non-PCI configs.
SVN-Revision: 14919
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.28')
-rw-r--r--target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch38
1 files changed, 25 insertions, 13 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch
index 570f0ec95b..127dab5923 100644
--- a/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch
@@ -1,23 +1,29 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
+Index: linux-2.6.28.7/arch/mips/Kconfig
+===================================================================
+--- linux-2.6.28.7.orig/arch/mips/Kconfig 2009-03-17 17:26:23.000000000 +0100
++++ linux-2.6.28.7/arch/mips/Kconfig 2009-03-17 17:27:33.000000000 +0100
@@ -53,6 +53,7 @@ config BCM47XX
select SSB_DRIVER_MIPS
select SSB_DRIVER_EXTIF
select SSB_EMBEDDED
-+ select SSB_B43_PCI_BRIDGE
++ select SSB_B43_PCI_BRIDGE if PCI
select SSB_PCICORE_HOSTMODE if PCI
select GENERIC_GPIO
select SYS_HAS_EARLY_PRINTK
---- a/arch/mips/bcm47xx/Makefile
-+++ b/arch/mips/bcm47xx/Makefile
+Index: linux-2.6.28.7/arch/mips/bcm47xx/Makefile
+===================================================================
+--- linux-2.6.28.7.orig/arch/mips/bcm47xx/Makefile 2009-03-17 17:26:19.000000000 +0100
++++ linux-2.6.28.7/arch/mips/bcm47xx/Makefile 2009-03-17 17:26:56.000000000 +0100
@@ -3,4 +3,4 @@
# under Linux.
#
-obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o
+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
---- a/arch/mips/bcm47xx/irq.c
-+++ b/arch/mips/bcm47xx/irq.c
+Index: linux-2.6.28.7/arch/mips/bcm47xx/irq.c
+===================================================================
+--- linux-2.6.28.7.orig/arch/mips/bcm47xx/irq.c 2009-03-17 17:26:19.000000000 +0100
++++ linux-2.6.28.7/arch/mips/bcm47xx/irq.c 2009-03-17 17:26:23.000000000 +0100
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
@@ -45,8 +51,10 @@
void plat_irq_dispatch(void)
{
u32 cause;
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
+Index: linux-2.6.28.7/arch/mips/bcm47xx/nvram.c
+===================================================================
+--- linux-2.6.28.7.orig/arch/mips/bcm47xx/nvram.c 2009-03-17 17:26:19.000000000 +0100
++++ linux-2.6.28.7/arch/mips/bcm47xx/nvram.c 2009-03-17 17:26:23.000000000 +0100
@@ -24,10 +24,10 @@
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -69,8 +77,10 @@
struct nvram_header *header;
int i;
u32 base, lim, off;
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
+Index: linux-2.6.28.7/arch/mips/bcm47xx/setup.c
+===================================================================
+--- linux-2.6.28.7.orig/arch/mips/bcm47xx/setup.c 2009-03-17 17:26:19.000000000 +0100
++++ linux-2.6.28.7/arch/mips/bcm47xx/setup.c 2009-03-17 17:26:23.000000000 +0100
@@ -2,7 +2,7 @@
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
* Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
@@ -294,8 +304,10 @@
+ return 0;
+}
+device_initcall(bcm47xx_register_gpiodev);
---- a/arch/mips/bcm47xx/time.c
-+++ b/arch/mips/bcm47xx/time.c
+Index: linux-2.6.28.7/arch/mips/bcm47xx/time.c
+===================================================================
+--- linux-2.6.28.7.orig/arch/mips/bcm47xx/time.c 2009-03-17 17:26:19.000000000 +0100
++++ linux-2.6.28.7/arch/mips/bcm47xx/time.c 2009-03-17 17:26:23.000000000 +0100
@@ -22,11 +22,17 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/