aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-01-24 08:14:09 -0500
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 05:06:33 -0500
commit2c30da717586a137b90c245820657a0d0a3a0a67 (patch)
tree3a23672f93ad0a56981559d6cef426bdd7c34aba /arch/cris
parentcacc0cc83fcc3bc0bc37a11ba9e7624c3aed6e08 (diff)
CRIS v32: ETRAX FS Change name of LED macros in drivers/mach-fs/gpio.c to avoid collision.
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/drivers/mach-fs/gpio.c16
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 56caafd0f93e..7863fd4efc2b 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] = {
181 181
182 182
183 183
184static unsigned int gpio_poll(struct file *file, struct poll_table *wait) 184static unsigned int gpio_poll(struct file *file, struct poll_table_struct *wait)
185{ 185{
186 unsigned int mask = 0; 186 unsigned int mask = 0;
187 struct gpio_private *priv = (struct gpio_private *)file->private_data; 187 struct gpio_private *priv = (struct gpio_private *)file->private_data;
@@ -841,8 +841,8 @@ gpio_leds_ioctl(unsigned int cmd, unsigned long arg)
841 case IO_LEDACTIVE_SET: 841 case IO_LEDACTIVE_SET:
842 green = ((unsigned char) arg) & 1; 842 green = ((unsigned char) arg) & 1;
843 red = (((unsigned char) arg) >> 1) & 1; 843 red = (((unsigned char) arg) >> 1) & 1;
844 LED_ACTIVE_SET_G(green); 844 CRIS_LED_ACTIVE_SET_G(green);
845 LED_ACTIVE_SET_R(red); 845 CRIS_LED_ACTIVE_SET_R(red);
846 break; 846 break;
847 847
848 default: 848 default:
@@ -938,11 +938,11 @@ gpio_init(void)
938 } 938 }
939 939
940 /* Clear all leds */ 940 /* Clear all leds */
941 LED_NETWORK_GRP0_SET(0); 941 CRIS_LED_NETWORK_GRP0_SET(0);
942 LED_NETWORK_GRP1_SET(0); 942 CRIS_LED_NETWORK_GRP1_SET(0);
943 LED_ACTIVE_SET(0); 943 CRIS_LED_ACTIVE_SET(0);
944 LED_DISK_READ(0); 944 CRIS_LED_DISK_READ(0);
945 LED_DISK_WRITE(0); 945 CRIS_LED_DISK_WRITE(0);
946 946
947 printk(KERN_INFO "ETRAX FS GPIO driver v2.5, (c) 2003-2007 " 947 printk(KERN_INFO "ETRAX FS GPIO driver v2.5, (c) 2003-2007 "
948 "Axis Communications AB\n"); 948 "Axis Communications AB\n");