mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 08:44:21 +08:00
CRIS v32: Change name of LED macros in drivers/mach-a3/gpio.c to avoid collision.
This commit is contained in:
parent
935a847b98
commit
cacc0cc83f
@ -788,8 +788,8 @@ gpio_leds_ioctl(unsigned int cmd, unsigned long arg)
|
||||
case IO_LEDACTIVE_SET:
|
||||
green = ((unsigned char) arg) & 1;
|
||||
red = (((unsigned char) arg) >> 1) & 1;
|
||||
LED_ACTIVE_SET_G(green);
|
||||
LED_ACTIVE_SET_R(red);
|
||||
CRIS_LED_ACTIVE_SET_G(green);
|
||||
CRIS_LED_ACTIVE_SET_R(red);
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -957,11 +957,11 @@ gpio_init(void)
|
||||
}
|
||||
|
||||
/* Clear all leds */
|
||||
LED_NETWORK_GRP0_SET(0);
|
||||
LED_NETWORK_GRP1_SET(0);
|
||||
LED_ACTIVE_SET(0);
|
||||
LED_DISK_READ(0);
|
||||
LED_DISK_WRITE(0);
|
||||
CRIS_LED_NETWORK_GRP0_SET(0);
|
||||
CRIS_LED_NETWORK_GRP1_SET(0);
|
||||
CRIS_LED_ACTIVE_SET(0);
|
||||
CRIS_LED_DISK_READ(0);
|
||||
CRIS_LED_DISK_WRITE(0);
|
||||
|
||||
printk(KERN_INFO "ETRAX FS GPIO driver v2.6, (c) 2003-2007 "
|
||||
"Axis Communications AB\n");
|
||||
|
Loading…
Reference in New Issue
Block a user