diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-03 01:33:17 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 01:33:17 -0400 |
| commit | 70f227d8846a8a9b1f36f71c42e11cc7c6e9408d (patch) | |
| tree | fb4dd5c8240bdaada819fb569c01a392b52847b9 /arch/powerpc/sysdev | |
| parent | a0c7ce9c877ceef8428798ac91fb794f83609aed (diff) | |
| parent | f778089cb2445dfc6dfd30a7a567925fd8589f1e (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/commproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c index b562afc4e50c..160a8b49bdea 100644 --- a/arch/powerpc/sysdev/commproc.c +++ b/arch/powerpc/sysdev/commproc.c | |||
| @@ -387,4 +387,4 @@ uint cpm_dpram_phys(u8* addr) | |||
| 387 | { | 387 | { |
| 388 | return (dpram_pbase + (uint)(addr - dpram_vbase)); | 388 | return (dpram_pbase + (uint)(addr - dpram_vbase)); |
| 389 | } | 389 | } |
| 390 | EXPORT_SYMBOL(cpm_dpram_addr); | 390 | EXPORT_SYMBOL(cpm_dpram_phys); |