diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
| commit | c7c350e92aab1bba68f26a6027b734adcf9824ba (patch) | |
| tree | aa99bd94c3049dd871d9c030d70a5f3d87591a95 /arch/arm/mach-orion/ts209-setup.c | |
| parent | 2f42b5d043ee271d1e5d30ecd77186b6c4d4e534 (diff) | |
| parent | f8512ad0da16cbe156f3a7627971cdf0b39c4138 (diff) | |
Merge branch 'hotfixes' into devel
Diffstat (limited to 'arch/arm/mach-orion/ts209-setup.c')
| -rw-r--r-- | arch/arm/mach-orion/ts209-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion/ts209-setup.c b/arch/arm/mach-orion/ts209-setup.c index b8cfe6813e9d..45764dad16d0 100644 --- a/arch/arm/mach-orion/ts209-setup.c +++ b/arch/arm/mach-orion/ts209-setup.c | |||
| @@ -357,4 +357,5 @@ MACHINE_START(TS209, "QNAP TS-109/TS-209") | |||
| 357 | .map_io = orion_map_io, | 357 | .map_io = orion_map_io, |
| 358 | .init_irq = orion_init_irq, | 358 | .init_irq = orion_init_irq, |
| 359 | .timer = &orion_timer, | 359 | .timer = &orion_timer, |
| 360 | .fixup = tag_fixup_mem32, | ||
| 360 | MACHINE_END | 361 | MACHINE_END |