From 0a9832b50de820cc54fcf813d371cafc8cf8cefc Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 19 Apr 2012 21:31:43 +0000 Subject: [PATCH] ar71xx: move USB device registration directly into rb751{,g}_setup SVN-Revision: 31355 --- target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c index 30d8eac796..4d02eb2d89 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c @@ -329,12 +329,10 @@ static int decode_rle(char *output, int len, char *in) #define RB751_MAC_ADDRESS_OFFSET 0xE80 #define RB751_CALDATA_OFFSET 0x27C -static void __init rb751_wlan_and_usb_setup(void) +static void __init rb751_wlan_setup(void) { u8 *hardconfig = (u8 *) KSEG1ADDR(RB751_HARDCONFIG); - ath79_register_usb(); - ath79_pci_set_plat_dev_init(rb751_pci_plat_dev_init); ath79_register_pci(); @@ -353,7 +351,8 @@ static void __init rb751_wlan_and_usb_setup(void) static void __init rb751_setup(void) { rb750_setup(); - rb751_wlan_and_usb_setup(); + ath79_register_usb(); + rb751_wlan_setup(); } MIPS_MACHINE(ATH79_MACH_RB_751, "751", "MikroTik RouterBOARD 751", @@ -362,7 +361,8 @@ MIPS_MACHINE(ATH79_MACH_RB_751, "751", "MikroTik RouterBOARD 751", static void __init rb751g_setup(void) { rb750gr3_setup(); - rb751_wlan_and_usb_setup(); + ath79_register_usb(); + rb751_wlan_setup(); } MIPS_MACHINE(ATH79_MACH_RB_751G, "751g", "MikroTik RouterBOARD 751G", -- 2.30.2