Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / staging / bcm / led_control.h

diff --git a/drivers/staging/bcm/led_control.h b/drivers/staging/bcm/led_control.h
index 318932d3e59fc91ad741c0a4ffce05d4f3f7eb74..bae40e22e11bf30951d245fc5e5159f1da567fc8 100644 (file)
--- a/drivers/staging/bcm/led_control.h
+++ b/drivers/staging/bcm/led_control.h
@@ -31,16 +31,14 @@
                        wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG, &gpio_val, sizeof(gpio_val)); \
        } while (0)
 
-#define B_ULONG32 unsigned long
-
-typedef enum _LEDColors {
+enum bcm_led_colors {
        RED_LED         = 1,
        BLUE_LED        = 2,
        YELLOW_LED      = 3,
        GREEN_LED       = 4
-} LEDColors; /* Enumerated values of different LED types */
+};
 
-typedef enum LedEvents {
+enum bcm_led_events {
        SHUTDOWN_EXIT           = 0x00,
        DRIVER_INIT             = 0x1,
        FW_DOWNLOAD             = 0x2,
@@ -53,7 +51,7 @@ typedef enum LedEvents {
        LED_THREAD_INACTIVE     = 0x100,  /* Makes the LED thread Inactivce. It wil be equivallent to putting the thread on hold. */
        LED_THREAD_ACTIVE       = 0x200,  /* Makes the LED Thread Active back. */
        DRIVER_HALT             = 0xff
-} LedEventInfo_t; /* Enumerated values of different driver states */
+}; /* Enumerated values of different driver states */
 
 /*
  * Structure which stores the information of different LED types