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 | 07c8ccf1634e96c5e578634dfb89c3e5dedf27ab (patch) | |
| tree | 6dcf8415967ca61be25c9a055249016b10caa9eb /target/linux/ar71xx/files/drivers/leds | |
| parent | 0b6aaa98af5e16a8748b90415bf4c14f23742bf6 (diff) | |
| download | master-187ad058-07c8ccf1634e96c5e578634dfb89c3e5dedf27ab.tar.gz master-187ad058-07c8ccf1634e96c5e578634dfb89c3e5dedf27ab.tar.bz2 master-187ad058-07c8ccf1634e96c5e578634dfb89c3e5dedf27ab.zip | |
ar71xx: merge 3.2 fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30406 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 = { |