diff options
author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-22 16:30:42 +0000 |
---|---|---|
committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-22 16:30:42 +0000 |
commit | 31a40f97ef54e10e2b3dc3cacb9cff436657c586 (patch) | |
tree | d0486f6bcb4c6cac1c25d4787ca13885ef6bd7ad /target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch | |
parent | 13a779d3f3a91f0f029990ac96a7607aa24f6fe6 (diff) |
brcm47xx: update bcma and ssb to master-2011-07-21
* add new patches for bcm4716 SoC
* add support for serial flash on bcma bus
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch index 8e5e88b6ba..fe23dc61cd 100644 --- a/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c -@@ -114,3 +114,30 @@ int nvram_getenv(char *name, char *val, +@@ -117,3 +117,30 @@ int nvram_getenv(char *name, char *val, return NVRAM_ERR_ENVNOTFOUND; } EXPORT_SYMBOL(nvram_getenv); @@ -33,10 +33,10 @@ +EXPORT_SYMBOL(nvram_get); --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -388,3 +388,20 @@ static int __init bcm47xx_register_bus_c +@@ -438,3 +438,20 @@ static int __init bcm47xx_register_flash return 0; } - device_initcall(bcm47xx_register_bus_complete); + fs_initcall(bcm47xx_register_flash); + +static int __init bcm47xx_register_gpiodev(void) +{ |