From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 30 Jan 2008 14:06:59 +0000 (+0000)
Subject: don't use mips_machgroup
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9bfca5ce18c5d02afc66a1c61fd85288d7af5d9e;p=openwrt%2Fstaging%2Fkaloz.git

don't use mips_machgroup

SVN-Revision: 10328
---

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/prom.c
index e051d04c4e..4ea9a6fdca 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/prom.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/prom.c
@@ -264,7 +264,6 @@ void __init prom_putchar(char ch)
 
 void __init prom_init(void)
 {
-	mips_machgroup = MACH_GROUP_ADM5120;
 	prom_detect_machtype();
 
 	prom_init_cmdline();
diff --git a/target/linux/adm5120/files/drivers/char/watchdog/adm5120_wdt.c b/target/linux/adm5120/files/drivers/char/watchdog/adm5120_wdt.c
index 2439fbc7f2..cddb1721cf 100644
--- a/target/linux/adm5120/files/drivers/char/watchdog/adm5120_wdt.c
+++ b/target/linux/adm5120/files/drivers/char/watchdog/adm5120_wdt.c
@@ -186,10 +186,6 @@ static int __init watchdog_init(void)
 {
 	int ret;
 
-	/* There should be check for ADM5120 */
-	if (mips_machgroup != MACH_GROUP_ADM5120)
-		return -1;
-
 	ret = misc_register(&wdt_miscdev);
 
 	if (ret)
diff --git a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
index 95b90fa474..54783abfaa 100644
--- a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
+++ b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
@@ -327,11 +327,6 @@ adm5120_leds_init(void)
 	struct mach_data *mach;
 	int i, ret;
 
-	if (mips_machgroup != MACH_GROUP_ADM5120) {
-		ret = -EINVAL;
-		goto err;
-	}
-
 	mach = adm5120_leds_findmach(mips_machtype);
 	if (mach == NULL) {
 		printk(KERN_ERR "leds-adm5120: unsupported board\n");
diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c
index 02c80f3fdf..ca7f8ef64b 100644
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c
@@ -188,9 +188,6 @@ static int usb_hcd_adm5120_probe(struct platform_device *pdev)
 {
 	int ret;
 
-	if (mips_machgroup != MACH_GROUP_ADM5120)
-		return -ENODEV;
-
 	ret = admhc_adm5120_probe(&adm5120_hc_driver, pdev);
 
 	return ret;
diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c
index 42eb8f5443..2d2604aa78 100644
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c
@@ -45,7 +45,7 @@
 #include "../core/hcd.h"
 #include "../core/hub.h"
 
-#define DRIVER_VERSION	"0.16.2"
+#define DRIVER_VERSION	"0.16.3"
 #define DRIVER_AUTHOR	"Gabor Juhos <juhosg at openwrt.org>"
 #define DRIVER_DESC	"ADMtek USB 1.1 Host Controller Driver"