target/linux/ar71xx/patches-3.3/101-MIPS-ath79-rename-pci-ath724x.h.patch

   1 From 293dcf4142717d8059540bd69d1517c442617569 Mon Sep 17 00:00:00 2001
   2 From: Gabor Juhos <juhosg@openwrt.org>
   3 Date: Wed, 14 Mar 2012 10:29:22 +0100
   4 Subject: [PATCH 06/47] MIPS: ath79: rename pci-ath724x.h
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 The declared function in this header file is used by the
  10 ath79 platform code only. Move the header to the platform
  11 directory.
  12
  13 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  14 Acked-by: René Bolldorf <xsecute@googlemail.com>
  15 Cc: linux-mips@linux-mips.org
  16 Patchwork: https://patchwork.linux-mips.org/patch/3486/
  17 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  18 ---
  19  arch/mips/ath79/mach-ubnt-xm.c                 |    2 +-
  20  arch/mips/ath79/pci.c                          |    2 +-
  21  arch/mips/ath79/pci.h                          |   21 +++++++++++++++++++++
  22  arch/mips/include/asm/mach-ath79/pci-ath724x.h |   21 ---------------------
  23  4 files changed, 23 insertions(+), 23 deletions(-)
  24  create mode 100644 arch/mips/ath79/pci.h
  25  delete mode 100644 arch/mips/include/asm/mach-ath79/pci-ath724x.h
  26
  27 --- a/arch/mips/ath79/mach-ubnt-xm.c
  28 +++ b/arch/mips/ath79/mach-ubnt-xm.c
  29 @@ -15,13 +15,13 @@
  30
  31  #ifdef CONFIG_PCI
  32  #include <linux/ath9k_platform.h>
  33 -#include <asm/mach-ath79/pci-ath724x.h>
  34  #endif /* CONFIG_PCI */
  35
  36  #include "machtypes.h"
  37  #include "dev-gpio-buttons.h"
  38  #include "dev-leds-gpio.h"
  39  #include "dev-spi.h"
  40 +#include "pci.h"
  41
  42  #define UBNT_XM_GPIO_LED_L1            0
  43  #define UBNT_XM_GPIO_LED_L2            1
  44 --- a/arch/mips/ath79/pci.c
  45 +++ b/arch/mips/ath79/pci.c
  46 @@ -9,7 +9,7 @@
  47   */
  48
  49  #include <linux/pci.h>
  50 -#include <asm/mach-ath79/pci-ath724x.h>
  51 +#include "pci.h"
  52
  53  static struct ath724x_pci_data *pci_data;
  54  static int pci_data_size;
  55 --- /dev/null
  56 +++ b/arch/mips/ath79/pci.h
  57 @@ -0,0 +1,21 @@
  58 +/*
  59 + *  Atheros 724x PCI support
  60 + *
  61 + *  Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
  62 + *
  63 + *  This program is free software; you can redistribute it and/or modify it
  64 + *  under the terms of the GNU General Public License version 2 as published
  65 + *  by the Free Software Foundation.
  66 + */
  67 +
  68 +#ifndef __ASM_MACH_ATH79_PCI_ATH724X_H
  69 +#define __ASM_MACH_ATH79_PCI_ATH724X_H
  70 +
  71 +struct ath724x_pci_data {
  72 +       int irq;
  73 +       void *pdata;
  74 +};
  75 +
  76 +void ath724x_pci_add_data(struct ath724x_pci_data *data, int size);
  77 +
  78 +#endif /* __ASM_MACH_ATH79_PCI_ATH724X_H */
  79 --- a/arch/mips/include/asm/mach-ath79/pci-ath724x.h
  80 +++ /dev/null
  81 @@ -1,21 +0,0 @@
  82 -/*
  83 - *  Atheros 724x PCI support
  84 - *
  85 - *  Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
  86 - *
  87 - *  This program is free software; you can redistribute it and/or modify it
  88 - *  under the terms of the GNU General Public License version 2 as published
  89 - *  by the Free Software Foundation.
  90 - */
  91 -
  92 -#ifndef __ASM_MACH_ATH79_PCI_ATH724X_H
  93 -#define __ASM_MACH_ATH79_PCI_ATH724X_H
  94 -
  95 -struct ath724x_pci_data {
  96 -       int irq;
  97 -       void *pdata;
  98 -};
  99 -
 100 -void ath724x_pci_add_data(struct ath724x_pci_data *data, int size);
 101 -
 102 -#endif /* __ASM_MACH_ATH79_PCI_ATH724X_H */