diff options
| author | Linus Torvalds | 2008-10-20 23:38:14 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-20 23:40:31 +0200 |
| commit | e3d2f927f788adcdabc42f8a1616f6cc56c53bbe (patch) | |
| tree | ff051e33cff49e23f4c4ef84360f22cf7a1998c9 /arch/parisc/include/asm/local.h | |
| parent | USB: Fix unused label warnings in drivers/usb/host/ehci-hcd.c (diff) | |
| parent | parisc: convert to generic compat_sys_ptrace (diff) | |
| download | kernel-qcow2-linux-e3d2f927f788adcdabc42f8a1616f6cc56c53bbe.tar.gz kernel-qcow2-linux-e3d2f927f788adcdabc42f8a1616f6cc56c53bbe.tar.xz kernel-qcow2-linux-e3d2f927f788adcdabc42f8a1616f6cc56c53bbe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: convert to generic compat_sys_ptrace
parisc: add rtc platform driver
parisc: initialize unwinder much earlier
parisc: add new syscalls
parisc: hijack jump to start_kernel
parisc: add pdc_coproc_cfg_unlocked and set_firmware_width_unlocked
parisc: move include/asm-parisc to arch/parisc/include/asm
parisc: move pdc_result to real2.S
parisc: unify CCIO_COLLECT_STATS implementation
parisc: add arch/parisc/kernel/.gitignore
parisc: ropes.h - fix <asm-parisc/*> -> <asm/*>
parisc: parisc-agp - fix <asm-parisc/*> -> <asm/*>
Resolve remove/rename conflict: include/asm-parisc/a.out.h is no longer
relevant.
Diffstat (limited to 'arch/parisc/include/asm/local.h')
| -rw-r--r-- | arch/parisc/include/asm/local.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/local.h b/arch/parisc/include/asm/local.h new file mode 100644 index 000000000000..c11c530f74d0 --- /dev/null +++ b/arch/parisc/include/asm/local.h @@ -0,0 +1 @@ +#include <asm-generic/local.h> |