From d2f6c11460d6e89d7c0488ea9b5d0cc9e4791e23 Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 28 Mar 2012 17:03:18 +0000 Subject: brcm47xx: update flash drivers git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31126 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/brcm47xx/patches-3.2/200-MIPS-BCM47XX-provide-sprom-to-bcma-bus.patch') 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 b0cf17d11..52005027c 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 * * 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 -- cgit v1.2.3