diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
| commit | 45de6fd958d7f407bdb5fdc6914b3262519d891c (patch) | |
| tree | c1b9f9023e93d0f28f773ca4be41d107f79cd600 /arch/powerpc/kernel/prom.c | |
| parent | 1f5d5dbf0372dd933d8325054889ba09d996e50b (diff) | |
| parent | 3b908870b8332dfd40be0e919e187aa4991536fb (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 4336390bcf3..1cb69e8fb0b 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -62,7 +62,7 @@ static int __initdata dt_root_addr_cells; static int __initdata dt_root_size_cells; #ifdef CONFIG_PPC64 -static int __initdata iommu_is_off; +int __initdata iommu_is_off; int __initdata iommu_force_on; unsigned long tce_alloc_start, tce_alloc_end; #endif |