diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-01-24 08:13:12 -0500 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-02-08 05:06:33 -0500 |
| commit | cacc0cc83fcc3bc0bc37a11ba9e7624c3aed6e08 (patch) | |
| tree | 3061bcf645da75456b9b7e2081f1196d1e014317 /arch/cris | |
| parent | 935a847b98899943ef86628aba54e4837c6c7ff6 (diff) | |
CRIS v32: Change name of LED macros in drivers/mach-a3/gpio.c to avoid collision.
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-a3/gpio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/cris/arch-v32/drivers/mach-a3/gpio.c b/arch/cris/arch-v32/drivers/mach-a3/gpio.c index 4c48065ce78a..30a2b6e526df 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/gpio.c +++ b/arch/cris/arch-v32/drivers/mach-a3/gpio.c | |||
| @@ -788,8 +788,8 @@ gpio_leds_ioctl(unsigned int cmd, unsigned long arg) | |||
| 788 | case IO_LEDACTIVE_SET: | 788 | case IO_LEDACTIVE_SET: |
| 789 | green = ((unsigned char) arg) & 1; | 789 | green = ((unsigned char) arg) & 1; |
| 790 | red = (((unsigned char) arg) >> 1) & 1; | 790 | red = (((unsigned char) arg) >> 1) & 1; |
| 791 | LED_ACTIVE_SET_G(green); | 791 | CRIS_LED_ACTIVE_SET_G(green); |
| 792 | LED_ACTIVE_SET_R(red); | 792 | CRIS_LED_ACTIVE_SET_R(red); |
| 793 | break; | 793 | break; |
| 794 | 794 | ||
| 795 | default: | 795 | default: |
| @@ -957,11 +957,11 @@ gpio_init(void) | |||
| 957 | } | 957 | } |
| 958 | 958 | ||
| 959 | /* Clear all leds */ | 959 | /* Clear all leds */ |
| 960 | LED_NETWORK_GRP0_SET(0); | 960 | CRIS_LED_NETWORK_GRP0_SET(0); |
| 961 | LED_NETWORK_GRP1_SET(0); | 961 | CRIS_LED_NETWORK_GRP1_SET(0); |
| 962 | LED_ACTIVE_SET(0); | 962 | CRIS_LED_ACTIVE_SET(0); |
| 963 | LED_DISK_READ(0); | 963 | CRIS_LED_DISK_READ(0); |
| 964 | LED_DISK_WRITE(0); | 964 | CRIS_LED_DISK_WRITE(0); |
| 965 | 965 | ||
| 966 | printk(KERN_INFO "ETRAX FS GPIO driver v2.6, (c) 2003-2007 " | 966 | printk(KERN_INFO "ETRAX FS GPIO driver v2.6, (c) 2003-2007 " |
| 967 | "Axis Communications AB\n"); | 967 | "Axis Communications AB\n"); |