diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-08-25 07:38:47 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-08-25 07:38:47 -0400 |
| commit | d555dd5065ab6dd4437c609950c5d9c6377b4896 (patch) | |
| tree | a2335e9d68a74cb833964ba9617d7279b98a6cdd /include | |
| parent | 9d84588bdb72b6ec9d891fbdaa4305023e16ee3a (diff) | |
| parent | 671c7235ccd537f828986ef5a4071bf477541dc0 (diff) | |
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'include')
| -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 { | |||
| 31 | unsigned long src_start; | 31 | unsigned long src_start; |
| 32 | int tx_trigger; | 32 | int tx_trigger; |
| 33 | int rx_trigger; | 33 | int rx_trigger; |
| 34 | int mode; | ||
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| 36 | #endif | 37 | #endif |