summaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-08-25 12:38:47 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-08-25 12:38:47 +0100
commitd555dd5065ab6dd4437c609950c5d9c6377b4896 (patch)
treea2335e9d68a74cb833964ba9617d7279b98a6cdd /include/asm-arm
parent9d84588bdb72b6ec9d891fbdaa4305023e16ee3a (diff)
parent671c7235ccd537f828986ef5a4071bf477541dc0 (diff)
downloadlinux-stable-d555dd5065ab6dd4437c609950c5d9c6377b4896.tar.gz
linux-stable-d555dd5065ab6dd4437c609950c5d9c6377b4896.tar.bz2
linux-stable-d555dd5065ab6dd4437c609950c5d9c6377b4896.zip
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-omap/irda.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/irda.h b/include/asm-arm/arch-omap/irda.h
index 345a649ec838..96bb12fab438 100644
--- a/include/asm-arm/arch-omap/irda.h
+++ b/include/asm-arm/arch-omap/irda.h
@@ -31,6 +31,7 @@ struct omap_irda_config {
unsigned long src_start;
int tx_trigger;
int rx_trigger;
+ int mode;
};
#endif