git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
char
/
agp
/
parisc-agp.c
diff --git
a/drivers/char/agp/parisc-agp.c
b/drivers/char/agp/parisc-agp.c
index f2492ecf082410da192b140d9a0615624ca79f3b..db60539bf67a1ed81216b35f29819cadfc43a83c 100644
(file)
--- 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"