| 1 | From ece52fe72b70e35f72edf940233d125257a5f4bc Mon Sep 17 00:00:00 2001 |
| 2 | From: Gabor Juhos <juhosg@openwrt.org> |
| 3 | Date: Fri, 18 Nov 2011 00:17:54 +0000 |
| 4 | Subject: [PATCH 25/27] MIPS: ath79: Rename dev-ar913x-wmac.h to dev-wmac.h |
| 5 | |
| 6 | The 'ar913x' part was removed from the common variable and function names, |
| 7 | so remove that from the relevant header file name as well. |
| 8 | |
| 9 | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> |
| 10 | Cc: Imre Kaloz <kaloz@openwrt.org> |
| 11 | Cc: linux-mips@linux-mips.org |
| 12 | Patchwork: https://patchwork.linux-mips.org/patch/3033/ |
| 13 | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> |
| 14 | --- |
| 15 | arch/mips/ath79/dev-ar913x-wmac.c | 2 +- |
| 16 | arch/mips/ath79/dev-ar913x-wmac.h | 17 ----------------- |
| 17 | arch/mips/ath79/dev-wmac.h | 17 +++++++++++++++++ |
| 18 | arch/mips/ath79/mach-ap121.c | 2 +- |
| 19 | arch/mips/ath79/mach-ap81.c | 2 +- |
| 20 | 5 files changed, 20 insertions(+), 20 deletions(-) |
| 21 | delete mode 100644 arch/mips/ath79/dev-ar913x-wmac.h |
| 22 | create mode 100644 arch/mips/ath79/dev-wmac.h |
| 23 | |
| 24 | --- a/arch/mips/ath79/dev-ar913x-wmac.c |
| 25 | +++ b/arch/mips/ath79/dev-ar913x-wmac.c |
| 26 | @@ -17,7 +17,7 @@ |
| 27 | |
| 28 | #include <asm/mach-ath79/ath79.h> |
| 29 | #include <asm/mach-ath79/ar71xx_regs.h> |
| 30 | -#include "dev-ar913x-wmac.h" |
| 31 | +#include "dev-wmac.h" |
| 32 | |
| 33 | static struct ath9k_platform_data ath79_wmac_data; |
| 34 | |
| 35 | --- a/arch/mips/ath79/dev-ar913x-wmac.h |
| 36 | +++ /dev/null |
| 37 | @@ -1,17 +0,0 @@ |
| 38 | -/* |
| 39 | - * Atheros AR913X/AR933X SoC built-in WMAC device support |
| 40 | - * |
| 41 | - * Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org> |
| 42 | - * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org> |
| 43 | - * |
| 44 | - * This program is free software; you can redistribute it and/or modify it |
| 45 | - * under the terms of the GNU General Public License version 2 as published |
| 46 | - * by the Free Software Foundation. |
| 47 | - */ |
| 48 | - |
| 49 | -#ifndef _ATH79_DEV_WMAC_H |
| 50 | -#define _ATH79_DEV_WMAC_H |
| 51 | - |
| 52 | -void ath79_register_wmac(u8 *cal_data); |
| 53 | - |
| 54 | -#endif /* _ATH79_DEV_WMAC_H */ |
| 55 | --- /dev/null |
| 56 | +++ b/arch/mips/ath79/dev-wmac.h |
| 57 | @@ -0,0 +1,17 @@ |
| 58 | +/* |
| 59 | + * Atheros AR913X/AR933X SoC built-in WMAC device support |
| 60 | + * |
| 61 | + * Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org> |
| 62 | + * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org> |
| 63 | + * |
| 64 | + * This program is free software; you can redistribute it and/or modify it |
| 65 | + * under the terms of the GNU General Public License version 2 as published |
| 66 | + * by the Free Software Foundation. |
| 67 | + */ |
| 68 | + |
| 69 | +#ifndef _ATH79_DEV_WMAC_H |
| 70 | +#define _ATH79_DEV_WMAC_H |
| 71 | + |
| 72 | +void ath79_register_wmac(u8 *cal_data); |
| 73 | + |
| 74 | +#endif /* _ATH79_DEV_WMAC_H */ |
| 75 | --- a/arch/mips/ath79/mach-ap121.c |
| 76 | +++ b/arch/mips/ath79/mach-ap121.c |
| 77 | @@ -13,7 +13,7 @@ |
| 78 | #include "dev-leds-gpio.h" |
| 79 | #include "dev-spi.h" |
| 80 | #include "dev-usb.h" |
| 81 | -#include "dev-ar913x-wmac.h" |
| 82 | +#include "dev-wmac.h" |
| 83 | |
| 84 | #define AP121_GPIO_LED_WLAN 0 |
| 85 | #define AP121_GPIO_LED_USB 1 |
| 86 | --- a/arch/mips/ath79/mach-ap81.c |
| 87 | +++ b/arch/mips/ath79/mach-ap81.c |
| 88 | @@ -10,7 +10,7 @@ |
| 89 | */ |
| 90 | |
| 91 | #include "machtypes.h" |
| 92 | -#include "dev-ar913x-wmac.h" |
| 93 | +#include "dev-wmac.h" |
| 94 | #include "dev-gpio-buttons.h" |
| 95 | #include "dev-leds-gpio.h" |
| 96 | #include "dev-spi.h" |
| 97 | |