aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-04-19 21:31:43 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-04-19 21:31:43 +0000
commit00d31059237056f6efee9a51e888827bd1e3be65 (patch)
tree757ad4e9d2b41031121a3880dc532422634137a7 /target/linux/ar71xx
parent83531b059e6a72dd7c0a21d93724cd2f04ca3f65 (diff)
downloadupstream-00d31059237056f6efee9a51e888827bd1e3be65.tar.gz
upstream-00d31059237056f6efee9a51e888827bd1e3be65.tar.bz2
upstream-00d31059237056f6efee9a51e888827bd1e3be65.zip
ar71xx: move USB device registration directly into rb751{,g}_setup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31355 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c10
1 files 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",