[PATCH 1/2] MIPS: ath79: rename dev-ar913x-wmac.h to dev-wmac.h

[PATCH 1/2] MIPS: ath79: rename dev-ar913x-wmac.h to dev-wmac.h

[Gabor Juhos]

The 'ar913x' part was removed from the common variable
and function names, so remove that from the relevant
header file name as well.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
 arch/mips/ath79/dev-ar913x-wmac.c                 |    2 +-
 arch/mips/ath79/{dev-ar913x-wmac.h => dev-wmac.h} |    0
 arch/mips/ath79/mach-ap121.c                      |    2 +-
 arch/mips/ath79/mach-ap81.c                       |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/mips/ath79/{dev-ar913x-wmac.h => dev-wmac.h} (100%)

diff --git a/arch/mips/ath79/dev-ar913x-wmac.c b/arch/mips/ath79/dev-ar913x-wmac.c
index c424e9a..24f5469 100644
--- a/arch/mips/ath79/dev-ar913x-wmac.c
+++ b/arch/mips/ath79/dev-ar913x-wmac.c
@@ -17,7 +17,7 @@
 
 #include <asm/mach-ath79/ath79.h>
 #include <asm/mach-ath79/ar71xx_regs.h>
-#include "dev-ar913x-wmac.h"
+#include "dev-wmac.h"
 
 static struct ath9k_platform_data ath79_wmac_data;
 
diff --git a/arch/mips/ath79/dev-ar913x-wmac.h b/arch/mips/ath79/dev-wmac.h
similarity index 100%
rename from arch/mips/ath79/dev-ar913x-wmac.h
rename to arch/mips/ath79/dev-wmac.h
diff --git a/arch/mips/ath79/mach-ap121.c b/arch/mips/ath79/mach-ap121.c
index 39ee828..4c20200 100644
--- a/arch/mips/ath79/mach-ap121.c
+++ b/arch/mips/ath79/mach-ap121.c
@@ -13,7 +13,7 @@
 #include "dev-leds-gpio.h"
 #include "dev-spi.h"
 #include "dev-usb.h"
-#include "dev-ar913x-wmac.h"
+#include "dev-wmac.h"
 
 #define AP121_GPIO_LED_WLAN		0
 #define AP121_GPIO_LED_USB		1
diff --git a/arch/mips/ath79/mach-ap81.c b/arch/mips/ath79/mach-ap81.c
index 84442da..abe19836 100644
--- a/arch/mips/ath79/mach-ap81.c
+++ b/arch/mips/ath79/mach-ap81.c
@@ -10,7 +10,7 @@
  */
 
 #include "machtypes.h"
-#include "dev-ar913x-wmac.h"
+#include "dev-wmac.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-spi.h"
-- 
1.7.2.1

[PATCH 2/2] MIPS: ath79: rename dev-ar913x-wmac.c to dev-wmac.c

[Gabor Juhos]

Rename the file as a last step of the 'ar913x' removal changes.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
 arch/mips/ath79/Makefile                          |    2 +-
 arch/mips/ath79/{dev-ar913x-wmac.c => dev-wmac.c} |    0
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename arch/mips/ath79/{dev-ar913x-wmac.c => dev-wmac.c} (100%)

diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index ac159e6..32c6990 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -20,7 +20,7 @@ obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o
 obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)	+= dev-leds-gpio.o
 obj-$(CONFIG_ATH79_DEV_SPI)		+= dev-spi.o
 obj-$(CONFIG_ATH79_DEV_USB)		+= dev-usb.o
-obj-$(CONFIG_ATH79_DEV_WMAC)		+= dev-ar913x-wmac.o
+obj-$(CONFIG_ATH79_DEV_WMAC)		+= dev-wmac.o
 
 #
 # Machines
diff --git a/arch/mips/ath79/dev-ar913x-wmac.c b/arch/mips/ath79/dev-wmac.c
similarity index 100%
rename from arch/mips/ath79/dev-ar913x-wmac.c
rename to arch/mips/ath79/dev-wmac.c
-- 
1.7.2.1

Re: [PATCH 2/2] MIPS: ath79: rename dev-ar913x-wmac.c to dev-wmac.c

[Ralf Baechle]

Queued for 3.3.  Thanks,

  Ralf

Re: [PATCH 1/2] MIPS: ath79: rename dev-ar913x-wmac.h to dev-wmac.h

[Ralf Baechle]

Ah, as ordered by the doctor :-)  Queued for 3.3.  Thanks,

  Ralf