diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-08 22:01:34 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-01-08 22:01:34 +0000 |
commit | be680c716c465a173c1c783185e3d023899742fc (patch) | |
tree | e04bb2d4e4853aa5a45e4c2a9963e501f65a7b52 /arch/arm/kernel/isa.c | |
parent | d8f2f1808aa4a38e841cad59db0e5d1ec3a1b014 (diff) | |
parent | 0dc6c490c0e2b81af32db3851040c109f7b3a54b (diff) | |
download | talos-op-linux-be680c716c465a173c1c783185e3d023899742fc.tar.gz talos-op-linux-be680c716c465a173c1c783185e3d023899742fc.zip |
Merge branch 'next-footbridge' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/kernel/isa.c')
-rw-r--r-- | arch/arm/kernel/isa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c index 50a30bc91872..8ac9b8424007 100644 --- a/arch/arm/kernel/isa.c +++ b/arch/arm/kernel/isa.c @@ -16,6 +16,7 @@ #include <linux/fs.h> #include <linux/sysctl.h> #include <linux/init.h> +#include <linux/io.h> static unsigned int isa_membase, isa_portbase, isa_portshift; |