diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/powerpc/platforms/pasemi/iommu.c | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/powerpc/platforms/pasemi/iommu.c')
| -rw-r--r-- | arch/powerpc/platforms/pasemi/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c index 4587c1dfeda5..07819cd3ac44 100644 --- a/arch/powerpc/platforms/pasemi/iommu.c +++ b/arch/powerpc/platforms/pasemi/iommu.c | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | #define IOBMAP_L2E_V 0x80000000 | 77 | #define IOBMAP_L2E_V 0x80000000 |
| 78 | #define IOBMAP_L2E_V_CACHED 0xc0000000 | 78 | #define IOBMAP_L2E_V_CACHED 0xc0000000 |
| 79 | 79 | ||
| 80 | static u32 *iob; | 80 | static u32 __iomem *iob; |
| 81 | static u32 iob_l1_emptyval; | 81 | static u32 iob_l1_emptyval; |
| 82 | static u32 iob_l2_emptyval; | 82 | static u32 iob_l2_emptyval; |
| 83 | static u32 *iob_l2_base; | 83 | static u32 *iob_l2_base; |