diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 18:48:23 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 18:48:23 +0300 |
| commit | ee1262dbc65ce0b6234a915d8432171e8d77f518 (patch) | |
| tree | 3a4003800d170de691b2e6a9c93c0ca6795678bf /arch/sparc/include/asm/btext.h | |
| parent | a421018e8c10e5593a1fee076af72a66c3fe8ca3 (diff) | |
| parent | 7f5620a5fcd658f219e85831d3691908f1eccbde (diff) | |
| download | linux-ee1262dbc65ce0b6234a915d8432171e8d77f518.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
sparc: Set UTS_MACHINE correctly.
sparc,leon: init_leon srmmu cleanup
sparc32: Remove early interrupt enable.
sparc, leon: Added Aeroflex Gaisler entry in manufacturer_info structure
sparc64: Faster early-boot framebuffer console.
Revert "sparc: Make atomic locks raw"
sparc: remove unused nfsd #includes
sparc: Fixup last users of irq_chip->typename
Added sparc_leon3_snooping_enabled() and converted extern inline to static inline
No auxio on LEON
apbuart: Use of_find_node_by_path to find root node.
sparc: Replace old style lock initializer
sparc: Make atomic locks raw
apbuart: Fix build and missing driver unregister.
apbuart: Kill dependency on deprecated Sparc-only PROM interfaces.
apbuart: Fix build warning.
sparc: Support for GRLIB APBUART serial port
watchdog: Remove BKL from rio watchdog driver
sparc: Remove BKL from apc
sparc,leon: Sparc-Leon SMP support
Diffstat (limited to 'arch/sparc/include/asm/btext.h')
| -rw-r--r-- | arch/sparc/include/asm/btext.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/btext.h b/arch/sparc/include/asm/btext.h new file mode 100644 index 000000000000..9b2bc6b6ed0a --- /dev/null +++ b/arch/sparc/include/asm/btext.h @@ -0,0 +1,6 @@ +#ifndef _SPARC_BTEXT_H +#define _SPARC_BTEXT_H + +extern int btext_find_display(void); + +#endif /* _SPARC_BTEXT_H */ |