Merge branch 'linux-2.6' into for-2.6.24

This commit is contained in:
Paul Mackerras
2007-10-03 15:33:17 +10:00
170 changed files with 2331 additions and 1607 deletions

View File

@@ -387,4 +387,4 @@ uint cpm_dpram_phys(u8* addr)
{
return (dpram_pbase + (uint)(addr - dpram_vbase));
}
EXPORT_SYMBOL(cpm_dpram_addr);
EXPORT_SYMBOL(cpm_dpram_phys);