diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/arm/mach-orion/dns323-setup.c | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-orion/dns323-setup.c')
| -rw-r--r-- | arch/arm/mach-orion/dns323-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion/dns323-setup.c b/arch/arm/mach-orion/dns323-setup.c index 02b280c24820..076e155ad510 100644 --- a/arch/arm/mach-orion/dns323-setup.c +++ b/arch/arm/mach-orion/dns323-setup.c | |||
| @@ -319,4 +319,5 @@ MACHINE_START(DNS323, "D-Link DNS-323") | |||
| 319 | .map_io = orion_map_io, | 319 | .map_io = orion_map_io, |
| 320 | .init_irq = orion_init_irq, | 320 | .init_irq = orion_init_irq, |
| 321 | .timer = &orion_timer, | 321 | .timer = &orion_timer, |
| 322 | .fixup = tag_fixup_mem32, | ||
| 322 | MACHINE_END | 323 | MACHINE_END |