diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 22:08:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 22:08:06 -0400 |
| commit | 411f5c7a502769ccc0377c5ba36cb0b283847ba8 (patch) | |
| tree | 2c3a29671e3f923de48c55f94194849264a7bf53 /arch/arm/Makefile | |
| parent | 6d7ed21d17e640b120b902a314143e5ef4917a70 (diff) | |
| parent | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (diff) | |
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
davinci: DM644x EVM: register MUSB device earlier
davinci: add spi devices on tnetv107x evm
davinci: add ssp config for tnetv107x evm board
davinci: add tnetv107x ssp platform device
spi: add ti-ssp spi master driver
mfd: add driver for sequencer serial port
ARM: EXYNOS4: Implement Clock gating for System MMU
ARM: EXYNOS4: Enhancement of System MMU driver
ARM: EXYNOS4: Add support for gpio interrupts
ARM: S5P: Add function to register gpio interrupt bank data
ARM: S5P: Cleanup S5P gpio interrupt code
ARM: EXYNOS4: Add missing GPYx banks
ARM: S3C64XX: Fix section mismatch from cpufreq init
ARM: EXYNOS4: Add keypad device to the SMDKV310
ARM: EXYNOS4: Update clocks for keypad
ARM: EXYNOS4: Update keypad base address
ARM: EXYNOS4: Add keypad device helpers
ARM: EXYNOS4: Add support for SATA on ARMLEX4210
plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
mach-u300: define a dummy filter function for coh901318
...
Fix up various conflicts in
- arch/arm/mach-exynos4/cpufreq.c
- arch/arm/mach-mxs/gpio.c
- drivers/net/Kconfig
- drivers/tty/serial/Kconfig
- drivers/tty/serial/Makefile
- drivers/usb/gadget/fsl_mxc_udc.c
- drivers/video/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5c7114bb8a25..c7d321a3d95d 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -181,7 +181,7 @@ machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 | |||
| 181 | machine-$(CONFIG_ARCH_S5P6442) := s5p6442 | 181 | machine-$(CONFIG_ARCH_S5P6442) := s5p6442 |
| 182 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 | 182 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 |
| 183 | machine-$(CONFIG_ARCH_S5PV210) := s5pv210 | 183 | machine-$(CONFIG_ARCH_S5PV210) := s5pv210 |
| 184 | machine-$(CONFIG_ARCH_S5PV310) := s5pv310 | 184 | machine-$(CONFIG_ARCH_EXYNOS4) := exynos4 |
| 185 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 185 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| 186 | machine-$(CONFIG_ARCH_SHARK) := shark | 186 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 187 | machine-$(CONFIG_ARCH_SHMOBILE) := shmobile | 187 | machine-$(CONFIG_ARCH_SHMOBILE) := shmobile |