diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-09-27 08:01:35 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-27 08:01:35 -0400 |
| commit | 44d94e8de54035e9f8584a92ed1ced68d0d8bb67 (patch) | |
| tree | 2bece0521d0b248ea4da33794bb13db47e022c26 /arch/arm | |
| parent | 63f57cd45b0811de9663edf4af6b170c5bd3860d (diff) | |
| parent | 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 (diff) | |
Merge branch 'pxa-cleanup' into devel
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/gpio.h | 8 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/gpio.h | 32 |
3 files changed, 0 insertions, 42 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e83529b42ac6..c0ed4b2a7ca1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -559,7 +559,6 @@ config ARCH_MMP | |||
| 559 | select GPIO_PXA | 559 | select GPIO_PXA |
| 560 | select IRQ_DOMAIN | 560 | select IRQ_DOMAIN |
| 561 | select MULTI_IRQ_HANDLER | 561 | select MULTI_IRQ_HANDLER |
| 562 | select NEED_MACH_GPIO_H | ||
| 563 | select PINCTRL | 562 | select PINCTRL |
| 564 | select PLAT_PXA | 563 | select PLAT_PXA |
| 565 | select SPARSE_IRQ | 564 | select SPARSE_IRQ |
| @@ -622,7 +621,6 @@ config ARCH_PXA | |||
| 622 | select GPIO_PXA | 621 | select GPIO_PXA |
| 623 | select HAVE_IDE | 622 | select HAVE_IDE |
| 624 | select MULTI_IRQ_HANDLER | 623 | select MULTI_IRQ_HANDLER |
| 625 | select NEED_MACH_GPIO_H | ||
| 626 | select PLAT_PXA | 624 | select PLAT_PXA |
| 627 | select SPARSE_IRQ | 625 | select SPARSE_IRQ |
| 628 | help | 626 | help |
diff --git a/arch/arm/mach-mmp/include/mach/gpio.h b/arch/arm/mach-mmp/include/mach/gpio.h deleted file mode 100644 index 13219ebf5128..000000000000 --- a/arch/arm/mach-mmp/include/mach/gpio.h +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | #ifndef __ASM_MACH_GPIO_H | ||
| 2 | #define __ASM_MACH_GPIO_H | ||
| 3 | |||
| 4 | #include <asm-generic/gpio.h> | ||
| 5 | |||
| 6 | #include <mach/cputype.h> | ||
| 7 | |||
| 8 | #endif /* __ASM_MACH_GPIO_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h deleted file mode 100644 index 0248e433bc98..000000000000 --- a/arch/arm/mach-pxa/include/mach/gpio.h +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-pxa/include/mach/gpio.h | ||
| 3 | * | ||
| 4 | * PXA GPIO wrappers for arch-neutral GPIO calls | ||
| 5 | * | ||
| 6 | * Written by Philipp Zabel <philipp.zabel@gmail.com> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation; either version 2 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * This program is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with this program; if not, write to the Free Software | ||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 21 | * | ||
| 22 | */ | ||
| 23 | |||
| 24 | #ifndef __ASM_ARCH_PXA_GPIO_H | ||
| 25 | #define __ASM_ARCH_PXA_GPIO_H | ||
| 26 | |||
| 27 | #include <asm-generic/gpio.h> | ||
| 28 | |||
| 29 | #include <mach/irqs.h> | ||
| 30 | #include <mach/hardware.h> | ||
| 31 | |||
| 32 | #endif | ||