diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 17:38:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 17:40:31 -0400 |
| commit | e3d2f927f788adcdabc42f8a1616f6cc56c53bbe (patch) | |
| tree | ff051e33cff49e23f4c4ef84360f22cf7a1998c9 /drivers/char | |
| parent | a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da (diff) | |
| parent | 81e192d6ce303b6792aa38ff35f41a1a7357f23a (diff) | |
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 'drivers/char')
| -rw-r--r-- | drivers/char/agp/parisc-agp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c index f2492ecf0824..db60539bf67a 100644 --- a/drivers/char/agp/parisc-agp.c +++ b/drivers/char/agp/parisc-agp.c | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | #include <linux/agp_backend.h> | 20 | #include <linux/agp_backend.h> |
| 21 | #include <linux/log2.h> | 21 | #include <linux/log2.h> |
| 22 | 22 | ||
| 23 | #include <asm-parisc/parisc-device.h> | 23 | #include <asm/parisc-device.h> |
| 24 | #include <asm-parisc/ropes.h> | 24 | #include <asm/ropes.h> |
| 25 | 25 | ||
| 26 | #include "agp.h" | 26 | #include "agp.h" |
| 27 | 27 | ||