Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cacc0cc83fcc3bc0bc37a11ba9e7624c3aed6e08
Commit: cacc0cc83fcc3bc0bc37a11ba9e7624c3aed6e08
Parent: 935a847b98899943ef86628aba54e4837c6c7ff6
Author: Jesper Nilsson <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 24 14:13:12 2008 +0100
Committer: Jesper Nilsson <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 11:06:33 2008 +0100
CRIS v32: Change name of LED macros in drivers/mach-a3/gpio.c to avoid
collision.
---
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 4c48065..30a2b6e 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)
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");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
