diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /arch/arm/mach-pxa/palmz72.c | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'arch/arm/mach-pxa/palmz72.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmz72.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c index 5a5329bc33f..e61c1cc0551 100644 --- a/arch/arm/mach-pxa/palmz72.c +++ b/arch/arm/mach-pxa/palmz72.c | |||
| @@ -402,6 +402,7 @@ MACHINE_START(PALMZ72, "Palm Zire72") | |||
| 402 | .boot_params = 0xa0000100, | 402 | .boot_params = 0xa0000100, |
| 403 | .map_io = pxa27x_map_io, | 403 | .map_io = pxa27x_map_io, |
| 404 | .init_irq = pxa27x_init_irq, | 404 | .init_irq = pxa27x_init_irq, |
| 405 | .handle_irq = pxa27x_handle_irq, | ||
| 405 | .timer = &pxa_timer, | 406 | .timer = &pxa_timer, |
| 406 | .init_machine = palmz72_init | 407 | .init_machine = palmz72_init |
| 407 | MACHINE_END | 408 | MACHINE_END |