diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:21:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:21:03 -0500 |
| commit | acc952c1f373bf3f66cc7a10680eee1762bed40b (patch) | |
| tree | de1135ffe304f4d8e53d282e5bb1bde5db04e0ae /arch/arm/Kconfig | |
| parent | 57e964e1ae9bd4f699ae1074430bcf81a9a11377 (diff) | |
| parent | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (diff) | |
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Cleanups on various subarchitectures
Cleanup patches for various ARM platforms and some of their associated
drivers, the bulk of these is for mach-91.
Arnd ended up pulling in the restart branch from Russell in order to
fix up some simple but annoying merge conflicts.
* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
arm/at91: fix build of stamp9g20
ARM: u300: delete memory.h
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
ARM: at91: delete the pcontrol_g20_defconfig
arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
arm/tegra: remove unused defines
arm/tegra: fix variable formatting in makefile
ARM: davinci: vpif: move code to driver core header from platform
ARM: at91/gpio: fix display of number of irq setuped
ARM: at91/gpio: drop PIN_BASE
ARM: at91/udc: use gpio_is_valid to check the gpio
ARM: at91/ohci: use gpio_is_valid to check the gpio
ARM: at91/nand: use gpio_is_valid to check the gpio
ARM: at91/mmc: use gpio_is_valid to check the gpio
ARM: at91/ide: use gpio_is_valid to check the gpio
ARM: at91/pata: use gpio_is_valid to check the gpio
ARM: at91/soc: use gpio_is_valid to check the gpio
...
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f72e1707d463..3cddfd87c727 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -658,6 +658,7 @@ config ARCH_PICOXCELL | |||
| 658 | select HAVE_SCHED_CLOCK | 658 | select HAVE_SCHED_CLOCK |
| 659 | select HAVE_TCM | 659 | select HAVE_TCM |
| 660 | select NO_IOPORT | 660 | select NO_IOPORT |
| 661 | select SPARSE_IRQ | ||
| 661 | select USE_OF | 662 | select USE_OF |
| 662 | help | 663 | help |
| 663 | This enables support for systems based on the Picochip picoXcell | 664 | This enables support for systems based on the Picochip picoXcell |
| @@ -892,7 +893,6 @@ config ARCH_U300 | |||
| 892 | select HAVE_MACH_CLKDEV | 893 | select HAVE_MACH_CLKDEV |
| 893 | select GENERIC_GPIO | 894 | select GENERIC_GPIO |
| 894 | select ARCH_REQUIRE_GPIOLIB | 895 | select ARCH_REQUIRE_GPIOLIB |
| 895 | select NEED_MACH_MEMORY_H | ||
| 896 | help | 896 | help |
| 897 | Support for ST-Ericsson U300 series mobile platforms. | 897 | Support for ST-Ericsson U300 series mobile platforms. |
| 898 | 898 | ||