diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /include/asm-powerpc/mmu-hash64.h | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'include/asm-powerpc/mmu-hash64.h')
| -rw-r--r-- | include/asm-powerpc/mmu-hash64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h index 39c5c5f62bf5..d1dc16afb118 100644 --- a/include/asm-powerpc/mmu-hash64.h +++ b/include/asm-powerpc/mmu-hash64.h | |||
| @@ -182,6 +182,7 @@ extern int mmu_io_psize; | |||
| 182 | extern int mmu_kernel_ssize; | 182 | extern int mmu_kernel_ssize; |
| 183 | extern int mmu_highuser_ssize; | 183 | extern int mmu_highuser_ssize; |
| 184 | extern u16 mmu_slb_size; | 184 | extern u16 mmu_slb_size; |
| 185 | extern unsigned long tce_alloc_start, tce_alloc_end; | ||
| 185 | 186 | ||
| 186 | /* | 187 | /* |
| 187 | * If the processor supports 64k normal pages but not 64k cache | 188 | * If the processor supports 64k normal pages but not 64k cache |