diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:08:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:08:32 -0400 |
| commit | 8871e73fdbde07d0a41393f7ee30787b65387b36 (patch) | |
| tree | c54027e3ceb18f00db886871494d5e7b56e74b45 /arch/sparc64/mm | |
| parent | 61a46dc9d1c10d07a2ed6b7d346b868803b52506 (diff) | |
| parent | 749805dc10e955b0170573061f9522a6a21cbae0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Add iomap interfaces.
[OPENPROM]: Rewrite driver to use in-kernel device tree.
[OPENPROMFS]: Rewrite using in-kernel device tree and seq_file.
[SPARC]: Add unique device_node IDs and a ".node" property.
[SPARC]: Add of_set_property() interface.
[SPARC64]: Export auxio_register to modules.
[SPARC64]: Add missing interfaces to dma-mapping.h
[SPARC64]: Export _PAGE_IE to modules.
[SPARC64]: Allow floppy driver to build modular.
[SPARC]: Export x_bus_type to modules.
[RIOWATCHDOG]: Fix the build.
[CPWATCHDOG]: Fix the build.
[PARPORT] sunbpp: Fix typo.
[MTD] sun_uflash: Port to new EBUS device layer.
Diffstat (limited to 'arch/sparc64/mm')
| -rw-r--r-- | arch/sparc64/mm/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 513993414747..5c2bcf354ce6 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -1568,6 +1568,7 @@ pgprot_t PAGE_EXEC __read_mostly; | |||
| 1568 | unsigned long pg_iobits __read_mostly; | 1568 | unsigned long pg_iobits __read_mostly; |
| 1569 | 1569 | ||
| 1570 | unsigned long _PAGE_IE __read_mostly; | 1570 | unsigned long _PAGE_IE __read_mostly; |
| 1571 | EXPORT_SYMBOL(_PAGE_IE); | ||
| 1571 | 1572 | ||
| 1572 | unsigned long _PAGE_E __read_mostly; | 1573 | unsigned long _PAGE_E __read_mostly; |
| 1573 | EXPORT_SYMBOL(_PAGE_E); | 1574 | EXPORT_SYMBOL(_PAGE_E); |