diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:17 +0100 |
commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
tree | 214348d40ed547a72f9612a7e5c94a01afded812 /arch/cris/arch-v10/kernel/crisksyms.c | |
parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'arch/cris/arch-v10/kernel/crisksyms.c')
-rw-r--r-- | arch/cris/arch-v10/kernel/crisksyms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/crisksyms.c b/arch/cris/arch-v10/kernel/crisksyms.c index e6b80135502..1ca6fc28323 100644 --- a/arch/cris/arch-v10/kernel/crisksyms.c +++ b/arch/cris/arch-v10/kernel/crisksyms.c @@ -1,6 +1,6 @@ #include <linux/module.h> #include <asm/io.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> /* Export shadow registers for the CPU I/O pins */ EXPORT_SYMBOL(genconfig_shadow); |