diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-08-25 13:38:47 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-08-25 13:38:47 +0200 |
commit | d555dd5065ab6dd4437c609950c5d9c6377b4896 (patch) | |
tree | a2335e9d68a74cb833964ba9617d7279b98a6cdd /include/asm-arm | |
parent | [ARM] 4551/1: s3c24xx: fix wrong virtual address offsets (diff) | |
parent | ARM: OMAP: Enable serial idling and wakeup features (diff) | |
download | linux-d555dd5065ab6dd4437c609950c5d9c6377b4896.tar.xz linux-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.h | 1 |
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 |