clocks {
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
-@@ -348,14 +348,6 @@ static int bcma_register_devices(struct
+@@ -326,14 +326,6 @@ static int bcma_register_devices(struct
}
#endif
#ifdef CONFIG_BCMA_NFLASH
if (bus->drv_cc.nflash.present) {
err = platform_device_register(&bcma_nflash_dev);
-@@ -436,6 +428,14 @@ int bcma_bus_register(struct bcma_bus *b
+@@ -411,6 +403,14 @@ int bcma_bus_register(struct bcma_bus *b
bcma_register_core(bus, core);
}