Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / arch / mips / bcm47xx / prom.c

diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index 29d3cbf9555feae7f96e4faf6b076f797d5b14c4..0fa646c5a844bfb18186db1625c26e1b6f6e5114 100644 (file)
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -163,4 +163,3 @@ void __init prom_init(void)
 void __init prom_free_prom_memory(void)
 {
 }
-