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 master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
sh
/
cchips
/
voyagergx
/
setup.c
diff --git
a/arch/sh/cchips/voyagergx/setup.c
b/arch/sh/cchips/voyagergx/setup.c
index
3a4cfaa
..
66b2fed
100644
(file)
--- a/
arch/sh/cchips/voyagergx/setup.c
+++ b/
arch/sh/cchips/voyagergx/setup.c
@@
-13,7
+13,7
@@
#include <linux/init.h>
#include <linux/module.h>
#include <asm/io.h>
-#include <asm/
mach/voyagergx_reg
.h>
+#include <asm/
voyagergx
.h>
static int __init setup_voyagergx(void)
{