diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
| commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
| tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /arch/arm/mach-orion/dns323-setup.c | |
| parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
| parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) | |
Merge branch 'master' of /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 |