summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/arch-v10/io.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-28 09:30:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-28 09:30:20 +0100
commit661299d9d0437a0ff72240f3d60016ac3a361a6e (patch)
tree765512576314fc3612b503f182b9ae4e60fcf849 /include/asm-cris/arch-v10/io.h
parent05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff)
parent41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff)
downloadtalos-obmc-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz
talos-obmc-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/asm-cris/arch-v10/io.h')
-rw-r--r--include/asm-cris/arch-v10/io.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-cris/arch-v10/io.h b/include/asm-cris/arch-v10/io.h
index 0bc38a0313c1..dd39198ec67d 100644
--- a/include/asm-cris/arch-v10/io.h
+++ b/include/asm-cris/arch-v10/io.h
@@ -6,6 +6,7 @@
/* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */
+extern unsigned long gen_config_ii_shadow;
extern unsigned long port_g_data_shadow;
extern unsigned char port_pa_dir_shadow;
extern unsigned char port_pa_data_shadow;
OpenPOWER on IntegriCloud