diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
| commit | acc696d93dcf993dec123d69d599979e1456ffec (patch) | |
| tree | b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 /arch/powerpc/kernel/prom.c | |
| parent | bf2af2a2027e52b653882fbca840620e896ae081 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' 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 4336390bcf34..1cb69e8fb0b1 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
| @@ -62,7 +62,7 @@ static int __initdata dt_root_addr_cells; | |||
| 62 | static int __initdata dt_root_size_cells; | 62 | static int __initdata dt_root_size_cells; |
| 63 | 63 | ||
| 64 | #ifdef CONFIG_PPC64 | 64 | #ifdef CONFIG_PPC64 |
| 65 | static int __initdata iommu_is_off; | 65 | int __initdata iommu_is_off; |
| 66 | int __initdata iommu_force_on; | 66 | int __initdata iommu_force_on; |
| 67 | unsigned long tce_alloc_start, tce_alloc_end; | 67 | unsigned long tce_alloc_start, tce_alloc_end; |
| 68 | #endif | 68 | #endif |