diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-02-10 08:19:33 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-02-10 08:19:33 +0000 |
commit | fe0c7aac669c960c7cc9683d5068980bf732c2f6 (patch) | |
tree | 9a7d0cc9c7c533b21aaf9455b01ce17dcf76a3a0 /target/linux/ar71xx/files/drivers/leds | |
parent | d72bde99cd03721fd5b04a1b365bd3f30d4277d9 (diff) | |
download | master-31e0f0ae-fe0c7aac669c960c7cc9683d5068980bf732c2f6.tar.gz master-31e0f0ae-fe0c7aac669c960c7cc9683d5068980bf732c2f6.tar.bz2 master-31e0f0ae-fe0c7aac669c960c7cc9683d5068980bf732c2f6.zip |
ar71xx: merge 3.2 fixes
SVN-Revision: 30406
Diffstat (limited to 'target/linux/ar71xx/files/drivers/leds')
-rw-r--r-- | target/linux/ar71xx/files/drivers/leds/leds-rb750.c | 3 | ||||
-rw-r--r-- | target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/target/linux/ar71xx/files/drivers/leds/leds-rb750.c b/target/linux/ar71xx/files/drivers/leds/leds-rb750.c index 531ac6b51d..40469444fe 100644 --- a/target/linux/ar71xx/files/drivers/leds/leds-rb750.c +++ b/target/linux/ar71xx/files/drivers/leds/leds-rb750.c @@ -9,12 +9,13 @@ * */ #include <linux/kernel.h> +#include <linux/module.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/leds.h> #include <linux/slab.h> -#include <asm/mach-ar71xx/mach-rb750.h> +#include <asm/mach-ath79/mach-rb750.h> #define DRV_NAME "leds-rb750" diff --git a/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c b/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c index 9f178611db..42f5b70bd8 100644 --- a/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c +++ b/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c @@ -12,7 +12,8 @@ #include <linux/module.h> #include <linux/platform_device.h> -#include <asm/mach-ar71xx/ar71xx.h> +#include <asm/mach-ath79/ar71xx_regs.h> +#include <asm/mach-ath79/ath79.h> #define DRIVER_NAME "wndr3700-led-usb" @@ -20,14 +21,14 @@ static void wndr3700_usb_led_set(struct led_classdev *cdev, enum led_brightness brightness) { if (brightness) - ar71xx_device_start(RESET_MODULE_GE1_PHY); + ath79_device_reset_clear(AR71XX_RESET_GE1_PHY); else - ar71xx_device_stop(RESET_MODULE_GE1_PHY); + ath79_device_reset_set(AR71XX_RESET_GE1_PHY); } static enum led_brightness wndr3700_usb_led_get(struct led_classdev *cdev) { - return ar71xx_device_stopped(RESET_MODULE_GE1_PHY) ? LED_OFF : LED_FULL; + return ath79_device_reset_get(AR71XX_RESET_GE1_PHY) ? LED_OFF : LED_FULL; } static struct led_classdev wndr3700_usb_led = { |