diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 10:53:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 10:53:11 -0400 |
| commit | 0e2ffbf650bf97499c02327719383818777651e6 (patch) | |
| tree | 70cc80a7270ac6ee9e338e4c87a1f06c2432e79b /include | |
| parent | 1b0f06d0b4860a8a73dc0b48540d82d8897ead71 (diff) | |
| parent | a83f982313bc60dd3d87e50f8c88d6a169e8a5a0 (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 of HEAD
* HEAD:
[SPARC]: Fix OF register translations under sub-PCI busses.
[SPARC64]: Refine Sabre wsync logic.
[SERIAL] sunsu: Handle keyboard and mouse ports directly.
[SPARC64]: Fix 2 bugs in sabre_irq_build()
[SPARC64]: Update defconfig.
[SPARC64]: Fix make headers_install
[SPARC64]: of_device_register() error checking fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild index c78d44bb195f..9284c3cb27ec 100644 --- a/include/asm-sparc64/Kbuild +++ b/include/asm-sparc64/Kbuild | |||
| @@ -4,7 +4,7 @@ ALTARCH := sparc | |||
| 4 | ARCHDEF := defined __sparc__ && defined __arch64__ | 4 | ARCHDEF := defined __sparc__ && defined __arch64__ |
| 5 | ALTARCHDEF := defined __sparc__ && !defined __arch64__ | 5 | ALTARCHDEF := defined __sparc__ && !defined __arch64__ |
| 6 | 6 | ||
| 7 | unifdef-y := fbio.h perfctr.h | 7 | unifdef-y += fbio.h perfctr.h |
| 8 | header-y += apb.h asi.h bbc.h bpp.h display7seg.h envctrl.h floppy.h \ | 8 | header-y += apb.h asi.h bbc.h bpp.h display7seg.h envctrl.h floppy.h \ |
| 9 | ipc.h kdebug.h mostek.h openprom.h openpromio.h parport.h \ | 9 | ipc.h kdebug.h mostek.h openprom.h openpromio.h parport.h \ |
| 10 | pconf.h psrcompat.h pstate.h reg.h uctx.h utrap.h watchdog.h | 10 | pconf.h psrcompat.h pstate.h reg.h uctx.h utrap.h watchdog.h |