Changeset 14919


Ignore:
Timestamp:
2009-03-17T17:45:23+01:00 (7 years ago)
Author:
mb
Message:

bcm47xx: Fix compilation on non-PCI configs.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch

    r14722 r14919  
    1 --- a/arch/mips/Kconfig 
    2 +++ b/arch/mips/Kconfig 
     1Index: linux-2.6.28.7/arch/mips/Kconfig 
     2=================================================================== 
     3--- linux-2.6.28.7.orig/arch/mips/Kconfig       2009-03-17 17:26:23.000000000 +0100 
     4+++ linux-2.6.28.7/arch/mips/Kconfig    2009-03-17 17:27:33.000000000 +0100 
    35@@ -53,6 +53,7 @@ config BCM47XX 
    46        select SSB_DRIVER_MIPS 
    57        select SSB_DRIVER_EXTIF 
    68        select SSB_EMBEDDED 
    7 +       select SSB_B43_PCI_BRIDGE 
     9+       select SSB_B43_PCI_BRIDGE if PCI 
    810        select SSB_PCICORE_HOSTMODE if PCI 
    911        select GENERIC_GPIO 
    1012        select SYS_HAS_EARLY_PRINTK 
    11 --- a/arch/mips/bcm47xx/Makefile 
    12 +++ b/arch/mips/bcm47xx/Makefile 
     13Index: linux-2.6.28.7/arch/mips/bcm47xx/Makefile 
     14=================================================================== 
     15--- linux-2.6.28.7.orig/arch/mips/bcm47xx/Makefile      2009-03-17 17:26:19.000000000 +0100 
     16+++ linux-2.6.28.7/arch/mips/bcm47xx/Makefile   2009-03-17 17:26:56.000000000 +0100 
    1317@@ -3,4 +3,4 @@ 
    1418 # under Linux. 
     
    1721-obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o 
    1822+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o 
    19 --- a/arch/mips/bcm47xx/irq.c 
    20 +++ b/arch/mips/bcm47xx/irq.c 
     23Index: linux-2.6.28.7/arch/mips/bcm47xx/irq.c 
     24=================================================================== 
     25--- linux-2.6.28.7.orig/arch/mips/bcm47xx/irq.c 2009-03-17 17:26:19.000000000 +0100 
     26+++ linux-2.6.28.7/arch/mips/bcm47xx/irq.c      2009-03-17 17:26:23.000000000 +0100 
    2127@@ -1,5 +1,6 @@ 
    2228 /* 
     
    4652 { 
    4753        u32 cause; 
    48 --- a/arch/mips/bcm47xx/nvram.c 
    49 +++ b/arch/mips/bcm47xx/nvram.c 
     54Index: linux-2.6.28.7/arch/mips/bcm47xx/nvram.c 
     55=================================================================== 
     56--- linux-2.6.28.7.orig/arch/mips/bcm47xx/nvram.c       2009-03-17 17:26:19.000000000 +0100 
     57+++ linux-2.6.28.7/arch/mips/bcm47xx/nvram.c    2009-03-17 17:26:23.000000000 +0100 
    5058@@ -24,10 +24,10 @@ 
    5159 #include <asm/io.h> 
     
    7078        int i; 
    7179        u32 base, lim, off; 
    72 --- a/arch/mips/bcm47xx/setup.c 
    73 +++ b/arch/mips/bcm47xx/setup.c 
     80Index: linux-2.6.28.7/arch/mips/bcm47xx/setup.c 
     81=================================================================== 
     82--- linux-2.6.28.7.orig/arch/mips/bcm47xx/setup.c       2009-03-17 17:26:19.000000000 +0100 
     83+++ linux-2.6.28.7/arch/mips/bcm47xx/setup.c    2009-03-17 17:26:23.000000000 +0100 
    7484@@ -2,7 +2,7 @@ 
    7585  *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org> 
     
    295305+} 
    296306+device_initcall(bcm47xx_register_gpiodev); 
    297 --- a/arch/mips/bcm47xx/time.c 
    298 +++ b/arch/mips/bcm47xx/time.c 
     307Index: linux-2.6.28.7/arch/mips/bcm47xx/time.c 
     308=================================================================== 
     309--- linux-2.6.28.7.orig/arch/mips/bcm47xx/time.c        2009-03-17 17:26:19.000000000 +0100 
     310+++ linux-2.6.28.7/arch/mips/bcm47xx/time.c     2009-03-17 17:26:23.000000000 +0100 
    299311@@ -22,11 +22,17 @@ 
    300312  *  675 Mass Ave, Cambridge, MA 02139, USA. 
Note: See TracChangeset for help on using the changeset viewer.