lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CRIS v32: Change name of LED macros in drivers/mach-a3/gpio.c to avoid collision.

Browse Source
This commit is contained in:
Jesper Nilsson
2008-01-24 14:13:12 +01:00
parent 935a847b98
commit cacc0cc83f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/cris/arch-v32/drivers/mach-a3/gpio.c
View File

@@ -788,8 +788,8 @@ gpio_leds_ioctl(unsigned int cmd, unsigned long arg)
case IO_LEDACTIVE_SET: case IO_LEDACTIVE_SET:
green = ((unsigned char) arg) & 1; green = ((unsigned char) arg) & 1;
red = (((unsigned char) arg) >> 1) & 1; red = (((unsigned char) arg) >> 1) & 1;
LED_ACTIVE_SET_G(green); CRIS_LED_ACTIVE_SET_G(green);
LED_ACTIVE_SET_R(red); CRIS_LED_ACTIVE_SET_R(red);
break; break;
default: default:
@@ -957,11 +957,11 @@ gpio_init(void)
} }
/* Clear all leds */ /* Clear all leds */
LED_NETWORK_GRP0_SET(0); CRIS_LED_NETWORK_GRP0_SET(0);
LED_NETWORK_GRP1_SET(0); CRIS_LED_NETWORK_GRP1_SET(0);
LED_ACTIVE_SET(0); CRIS_LED_ACTIVE_SET(0);
LED_DISK_READ(0); CRIS_LED_DISK_READ(0);
LED_DISK_WRITE(0); CRIS_LED_DISK_WRITE(0);
printk(KERN_INFO "ETRAX FS GPIO driver v2.6, (c) 2003-2007 " printk(KERN_INFO "ETRAX FS GPIO driver v2.6, (c) 2003-2007 "
"Axis Communications AB\n"); "Axis Communications AB\n");