diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-29 09:57:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-29 09:57:15 +1000 |
| commit | 710629e5841d300c18f6067fb7df20f081b3e035 (patch) | |
| tree | d01ad70630991097ec166e3effcfebeeab44daf4 /drivers/char | |
| parent | 07db648b93af2469d27cd3b47f75d18bac48027c (diff) | |
| parent | 07f3b22ee687d12ff20cb550125dec3640d31c2f (diff) | |
Merge commit 'parisc/master'
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 8c42dcc5958c..f4bbcb273208 100644 --- a/drivers/char/agp/parisc-agp.c +++ b/drivers/char/agp/parisc-agp.c @@ -20,8 +20,8 @@ #include <linux/agp_backend.h> #include <linux/log2.h> -#include <asm-parisc/parisc-device.h> -#include <asm-parisc/ropes.h> +#include <asm/parisc-device.h> +#include <asm/ropes.h> #include "agp.h" |