---

yaml --- r: 183778 b: refs/heads/master c: 2a6ace1 h: refs/heads/master v: v3
git-mirror · Feb 2, 2010 · 3e20c30 · 3e20c30
1 parent e2deeba
commit 3e20c30
Show file tree

Hide file tree

Showing 4 changed files with 835 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c85bb41e93184bf5494dde6d8fe5a81b564c84c8
+refs/heads/master: 2a6ace1b3d4dc65401e71fc01af100692b9f27f8
diff --git a/trunk/drivers/net/irda/Kconfig b/trunk/drivers/net/irda/Kconfig
@@ -64,6 +64,16 @@ endchoice
 
 comment "Dongle support"
 
+config SH_SIR
+	tristate "SuperH SIR on UART"
+	depends on IRDA && SUPERH && \
+		(CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7723 || \
+		 CPU_SUBTYPE_SH7724)
+	default n
+	help
+	  Say Y here if your want to enable SIR function on SuperH UART
+	  devices.
+
 config DONGLE
 	bool "Serial dongle support"
 	depends on IRTTY_SIR

diff --git a/trunk/drivers/net/irda/Makefile b/trunk/drivers/net/irda/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_AU1000_FIR)	+= au1k_ir.o
 # SIR drivers
 obj-$(CONFIG_IRTTY_SIR)		+= irtty-sir.o	sir-dev.o
 obj-$(CONFIG_BFIN_SIR)		+= bfin_sir.o
+obj-$(CONFIG_SH_SIR)		+= sh_sir.o
 # dongle drivers for SIR drivers
 obj-$(CONFIG_ESI_DONGLE)	+= esi-sir.o
 obj-$(CONFIG_TEKRAM_DONGLE)	+= tekram-sir.o