Merge branch 'master' into for-next

[~andy/linux] / arch / mips / ath79 / mach-db120.c

diff --git a/arch/mips/ath79/mach-db120.c b/arch/mips/ath79/mach-db120.c
index 1983e4d2af4b36a925afd9644a2ff6ccc970b1c1..42f540a724f43437e3f2c1a292cb2084a85cad51 100644 (file)
--- a/arch/mips/ath79/mach-db120.c
+++ b/arch/mips/ath79/mach-db120.c
@@ -25,6 +25,7 @@
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-spi.h"
+#include "dev-usb.h"
 #include "dev-wmac.h"
 #include "pci.h"
 
@@ -126,6 +127,7 @@ static void __init db120_setup(void)
                                        db120_gpio_keys);
        ath79_register_spi(&db120_spi_data, db120_spi_info,
                           ARRAY_SIZE(db120_spi_info));
+       ath79_register_usb();
        ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET);
        db120_pci_init(art + DB120_PCIE_CALDATA_OFFSET);
 }