diff --git a/[refs] b/[refs] index 5456cfc8da49..734f5b7c0940 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d625a29ba649a4df6027520ffc378f23c0e6883e +refs/heads/master: 36316126e90b058ad7bd5b9e3d6079814e0a17e2 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h index 0ec217da48d4..baeafd45180b 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h @@ -1057,7 +1057,7 @@ struct iwl_priv { struct iwl_rfkill_mngr rfkill_mngr; #endif -#ifdef CONFIG_IWL4965_LEDS +#ifdef CONFIG_IWLWIFI_LEDS struct iwl4965_led led[IWL_LED_TRG_MAX]; unsigned long last_blink_time; u8 last_blink_rate;