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

   1 From 204fd70abd99099f6c2e2213a2baa1d51c03a039 Mon Sep 17 00:00:00 2001
   2 From: Gabor Juhos <juhosg@openwrt.org>
   3 Date: Fri, 18 Nov 2011 09:50:50 +0100
   4 Subject: [PATCH 03/35] 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
  16 v4: - add an Acked-by tag from René
  17 v3: - move include "pci.h" out of the #ifdef CONFIG_PCI section
  18 v2: - no changes
  19 ---
  20  arch/mips/ath79/mach-ubnt-xm.c                 |    2 +-
  21  arch/mips/ath79/pci.c                          |    2 +-
  22  arch/mips/ath79/pci.h                          |   21 +++++++++++++++++++++
  23  arch/mips/include/asm/mach-ath79/pci-ath724x.h |   21 ---------------------
  24  4 files changed, 23 insertions(+), 23 deletions(-)
  25  create mode 100644 arch/mips/ath79/pci.h
  26  delete mode 100644 arch/mips/include/asm/mach-ath79/pci-ath724x.h
  27
  28 --- a/arch/mips/ath79/mach-ubnt-xm.c
  29 +++ b/arch/mips/ath79/mach-ubnt-xm.c
  30 @@ -15,13 +15,13 @@
  31
  32  #ifdef CONFIG_PCI
  33  #include <linux/ath9k_platform.h>
  34 -#include <asm/mach-ath79/pci-ath724x.h>
  35  #endif /* CONFIG_PCI */
  36
  37  #include "machtypes.h"
  38  #include "dev-gpio-buttons.h"
  39  #include "dev-leds-gpio.h"
  40  #include "dev-spi.h"
  41 +#include "pci.h"
  42
  43  #define UBNT_XM_GPIO_LED_L1            0
  44  #define UBNT_XM_GPIO_LED_L2            1
  45 --- a/arch/mips/ath79/pci.c
  46 +++ b/arch/mips/ath79/pci.c
  47 @@ -9,7 +9,7 @@
  48   */
  49
  50  #include <linux/pci.h>
  51 -#include <asm/mach-ath79/pci-ath724x.h>
  52 +#include "pci.h"
  53
  54  static struct ath724x_pci_data *pci_data;
  55  static int pci_data_size;
  56 --- /dev/null
  57 +++ b/arch/mips/ath79/pci.h
  58 @@ -0,0 +1,21 @@
  59 +/*
  60 + *  Atheros 724x PCI support
  61 + *
  62 + *  Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
  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 __ASM_MACH_ATH79_PCI_ATH724X_H
  70 +#define __ASM_MACH_ATH79_PCI_ATH724X_H
  71 +
  72 +struct ath724x_pci_data {
  73 +       int irq;
  74 +       void *pdata;
  75 +};
  76 +
  77 +void ath724x_pci_add_data(struct ath724x_pci_data *data, int size);
  78 +
  79 +#endif /* __ASM_MACH_ATH79_PCI_ATH724X_H */
  80 --- a/arch/mips/include/asm/mach-ath79/pci-ath724x.h
  81 +++ /dev/null
  82 @@ -1,21 +0,0 @@
  83 -/*
  84 - *  Atheros 724x PCI support
  85 - *
  86 - *  Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
  87 - *
  88 - *  This program is free software; you can redistribute it and/or modify it
  89 - *  under the terms of the GNU General Public License version 2 as published
  90 - *  by the Free Software Foundation.
  91 - */
  92 -
  93 -#ifndef __ASM_MACH_ATH79_PCI_ATH724X_H
  94 -#define __ASM_MACH_ATH79_PCI_ATH724X_H
  95 -
  96 -struct ath724x_pci_data {
  97 -       int irq;
  98 -       void *pdata;
  99 -};
 100 -
 101 -void ath724x_pci_add_data(struct ath724x_pci_data *data, int size);
 102 -
 103 -#endif /* __ASM_MACH_ATH79_PCI_ATH724X_H */