diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-03-28 17:03:18 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-03-28 17:03:18 +0000 |
| commit | 13b6ec1d0562c6e97a2e71f58f2cbf93d5ed9c0b (patch) | |
| tree | e84a0e0a465ad0c932ba9d0c59f40958573a20bf /target/linux/brcm47xx/patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch | |
| parent | f96ffe2c96d937d321938400922cf67d429b7ccb (diff) | |
| download | upstream-13b6ec1d0562c6e97a2e71f58f2cbf93d5ed9c0b.tar.gz upstream-13b6ec1d0562c6e97a2e71f58f2cbf93d5ed9c0b.tar.bz2 upstream-13b6ec1d0562c6e97a2e71f58f2cbf93d5ed9c0b.zip | |
brcm47xx: update flash drivers
SVN-Revision: 31126
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch b/target/linux/brcm47xx/patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch index b0cf17d11a..52005027cf 100644 --- a/target/linux/brcm47xx/patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch +++ b/target/linux/brcm47xx/patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch @@ -9,7 +9,7 @@ * Copyright (C) 2011-2012 Tathagata Das <tathagata@alumnux.com> * * This program is free software; you can redistribute it and/or modify it -@@ -93,7 +93,7 @@ static void bcm47xx_machine_halt(void) +@@ -132,7 +132,7 @@ static void bcm47xx_machine_halt(void) } #ifdef CONFIG_BCM47XX_SSB @@ -18,7 +18,7 @@ { char prefix[10]; -@@ -110,7 +110,7 @@ static int bcm47xx_get_sprom(struct ssb_ +@@ -149,7 +149,7 @@ static int bcm47xx_get_sprom(struct ssb_ } static int bcm47xx_get_invariants(struct ssb_bus *bus, @@ -27,7 +27,7 @@ { char buf[20]; -@@ -165,7 +165,7 @@ static void __init bcm47xx_register_ssb( +@@ -204,7 +204,7 @@ static void __init bcm47xx_register_ssb( char buf[100]; struct ssb_mipscore *mcore; @@ -36,7 +36,7 @@ if (err) printk(KERN_WARNING "bcm47xx: someone else already registered" " a ssb SPROM callback handler (err %d)\n", err); -@@ -199,10 +199,41 @@ static void __init bcm47xx_register_ssb( +@@ -256,10 +256,41 @@ static int __init bcm47xx_register_flash #endif #ifdef CONFIG_BCM47XX_BCMA |