projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
video
/
pnx4008
/
dum.h
diff --git
a/drivers/video/pnx4008/dum.h
b/drivers/video/pnx4008/dum.h
index d80a614d89ed3af34897b9a08ff14d83615d19a7..1234d4375d9249a01735d4717164089756be0de0 100644
(file)
--- a/
drivers/video/pnx4008/dum.h
+++ b/
drivers/video/pnx4008/dum.h
@@
-12,7
+12,7
@@
#ifndef __PNX008_DUM_H__
#define __PNX008_DUM_H__
-#include <
asm/ar
ch/platform.h>
+#include <
ma
ch/platform.h>
#define PNX4008_DUMCONF_VA_BASE IO_ADDRESS(PNX4008_DUMCONF_BASE)
#define PNX4008_DUM_MAIN_VA_BASE IO_ADDRESS(PNX4008_DUM_MAINCFG_BASE)