Sfoglia il codice sorgente

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

Jesper Nilsson 17 anni fa
parent
commit
cacc0cc83f
1 ha cambiato i file con 7 aggiunte e 7 eliminazioni
  1. 7 7
      arch/cris/arch-v32/drivers/mach-a3/gpio.c

+ 7 - 7
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");