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/mach-orion5x/wrt350n-v2-setup.c | |
| 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/mach-orion5x/wrt350n-v2-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/wrt350n-v2-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c index a5989b7eb53e..fab79d09cc5c 100644 --- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c | |||
| @@ -263,6 +263,7 @@ MACHINE_START(WRT350N_V2, "Linksys WRT350N v2") | |||
| 263 | .boot_params = 0x00000100, | 263 | .boot_params = 0x00000100, |
| 264 | .init_machine = wrt350n_v2_init, | 264 | .init_machine = wrt350n_v2_init, |
| 265 | .map_io = orion5x_map_io, | 265 | .map_io = orion5x_map_io, |
| 266 | .init_early = orion5x_init_early, | ||
| 266 | .init_irq = orion5x_init_irq, | 267 | .init_irq = orion5x_init_irq, |
| 267 | .timer = &orion5x_timer, | 268 | .timer = &orion5x_timer, |
| 268 | .fixup = tag_fixup_mem32, | 269 | .fixup = tag_fixup_mem32, |