Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2c30da717586a137b90c245820657a0d0a3a0a67
Commit:     2c30da717586a137b90c245820657a0d0a3a0a67
Parent:     cacc0cc83fcc3bc0bc37a11ba9e7624c3aed6e08
Author:     Jesper Nilsson <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 24 14:14:09 2008 +0100
Committer:  Jesper Nilsson <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 11:06:33 2008 +0100

    CRIS v32: ETRAX FS Change name of LED macros in drivers/mach-fs/gpio.c to 
avoid collision.
---
 arch/cris/arch-v32/drivers/mach-fs/gpio.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/cris/arch-v32/drivers/mach-fs/gpio.c 
b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
index 56caafd..7863fd4 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/gpio.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
@@ -181,7 +181,7 @@ static volatile unsigned long *dir_oe[NUM_PORTS] = {
 
 
 
-static unsigned int gpio_poll(struct file *file, struct poll_table *wait)
+static unsigned int gpio_poll(struct file *file, struct poll_table_struct 
*wait)
 {
        unsigned int mask = 0;
        struct gpio_private *priv = (struct gpio_private *)file->private_data;
@@ -841,8 +841,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:
@@ -938,11 +938,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.5, (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

Reply via email to