git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
drivers
/
cdrom
/
gdrom.c
diff --git
a/drivers/cdrom/gdrom.c
b/drivers/cdrom/gdrom.c
index
71ec426
..
1e0455b
100644
(file)
--- a/
drivers/cdrom/gdrom.c
+++ b/
drivers/cdrom/gdrom.c
@@
-39,8
+39,8
@@
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/delay.h>
-#include <
asm/
mach/dma.h>
-#include <
asm/
mach/sysasic.h>
+#include <mach/dma.h>
+#include <mach/sysasic.h>
#define GDROM_DEV_NAME "gdrom"
#define GD_SESSION_OFFSET 150