Acked-by: Rene Bolldorf <xsecute@googlemail.com>
On Sun, Nov 20, 2011 at 10:39 PM, Gabor Juhos <juhosg@openwrt.org> wrote:
> The declared function in this header file is used by the
> ath79 platform code only. Move the header to the platform
> directory.
>
> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
> ---
> v3: - move include "pci.h" out of the #ifdef CONFIG_PCI section
> v2: - no changes
> ---
> arch/mips/ath79/mach-ubnt-xm.c | 2 +-
> arch/mips/ath79/pci.c | 2 +-
> .../asm/mach-ath79/pci-ath724x.h => ath79/pci.h} | 0
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename arch/mips/{include/asm/mach-ath79/pci-ath724x.h => ath79/pci.h} (100%)
>
> diff --git a/arch/mips/ath79/mach-ubnt-xm.c b/arch/mips/ath79/mach-ubnt-xm.c
> index 3c311a5..a043500 100644
> --- a/arch/mips/ath79/mach-ubnt-xm.c
> +++ b/arch/mips/ath79/mach-ubnt-xm.c
> @@ -15,13 +15,13 @@
>
> #ifdef CONFIG_PCI
> #include <linux/ath9k_platform.h>
> -#include <asm/mach-ath79/pci-ath724x.h>
> #endif /* CONFIG_PCI */
>
> #include "machtypes.h"
> #include "dev-gpio-buttons.h"
> #include "dev-leds-gpio.h"
> #include "dev-spi.h"
> +#include "pci.h"
>
> #define UBNT_XM_GPIO_LED_L1 0
> #define UBNT_XM_GPIO_LED_L2 1
> diff --git a/arch/mips/ath79/pci.c b/arch/mips/ath79/pci.c
> index 8db076e..4957428 100644
> --- a/arch/mips/ath79/pci.c
> +++ b/arch/mips/ath79/pci.c
> @@ -9,7 +9,7 @@
> */
>
> #include <linux/pci.h>
> -#include <asm/mach-ath79/pci-ath724x.h>
> +#include "pci.h"
>
> static struct ath724x_pci_data *pci_data;
> static int pci_data_size;
> diff --git a/arch/mips/include/asm/mach-ath79/pci-ath724x.h
> b/arch/mips/ath79/pci.h
> similarity index 100%
> rename from arch/mips/include/asm/mach-ath79/pci-ath724x.h
> rename to arch/mips/ath79/pci.h
> --
> 1.7.2.1
>
>
|