diff --git a/[refs] b/[refs] index 708abd0c08d3..a6cacb3dae4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e53aac424767a9f42b3bbac22eb001491f605d4e +refs/heads/master: 77375bb01cc030c680d5892eb1e756bc100c8022 diff --git a/trunk/drivers/net/wireless/iwlegacy/3945.h b/trunk/drivers/net/wireless/iwlegacy/3945.h index 7559a5ed3b6d..e89ca5da7f3c 100644 --- a/trunk/drivers/net/wireless/iwlegacy/3945.h +++ b/trunk/drivers/net/wireless/iwlegacy/3945.h @@ -34,7 +34,6 @@ /* Hardware specific file defines the PCI IDs table for that hardware module */ extern const struct pci_device_id il3945_hw_card_ids[]; -#include "iwl-csr.h" #include "iwl-prph.h" #include "iwl-debug.h" #include "iwl-power.h" diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-csr.h b/trunk/drivers/net/wireless/iwlegacy/csr.h similarity index 100% rename from trunk/drivers/net/wireless/iwlegacy/iwl-csr.h rename to trunk/drivers/net/wireless/iwlegacy/csr.h diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-dev.h b/trunk/drivers/net/wireless/iwlegacy/iwl-dev.h index 991b455ecca2..ce5bc5302044 100644 --- a/trunk/drivers/net/wireless/iwlegacy/iwl-dev.h +++ b/trunk/drivers/net/wireless/iwlegacy/iwl-dev.h @@ -40,7 +40,7 @@ #include #include "iwl-eeprom.h" -#include "iwl-csr.h" +#include "csr.h" #include "iwl-prph.h" #include "iwl-debug.h" #include "4965.h"