--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -142,7 +142,6 @@ static struct platform_device bcm63xx_gp
+@@ -141,7 +141,6 @@ static struct platform_device bcm63xx_gp
int __init board_register_devices(void)
{
int usbh_ports = 0;
if (board.has_uart0)
bcm63xx_uart_register(0);
-@@ -188,8 +187,8 @@ int __init board_register_devices(void)
+@@ -184,8 +183,8 @@ int __init board_register_devices(void)
* do this after registering enet devices
*/
#endif
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -7,6 +7,7 @@
+@@ -6,6 +6,7 @@
+ #include <linux/leds.h>
#include <bcm63xx_dev_enet.h>
#include <bcm63xx_dev_usb_usbd.h>
- #include <bcm63xx_dev_dsp.h>
+#include <bcm63xx_fallback_sprom.h>
/*
* flash mapping
-@@ -54,6 +55,9 @@ struct board_info {
+@@ -49,6 +50,9 @@ struct board_info {
/* External PHY reset GPIO flags from gpio.h */
unsigned long ephy_reset_gpio_flags;