---

yaml --- r: 193977 b: refs/heads/master c: 17a328c h: refs/heads/master i: 193975: 16acac4 v: v3
git-mirror · Apr 7, 2010 · 6d95166 · 6d95166
1 parent a53b513
commit 6d95166
Show file tree

Hide file tree

Showing 4 changed files with 873 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33d8212c4db350652d3991d60405826373fbfd60
+refs/heads/master: 17a328ca8c04cf88be9a9ef1cb74f359c59f1802
diff --git a/trunk/drivers/net/irda/Kconfig b/trunk/drivers/net/irda/Kconfig
@@ -397,5 +397,11 @@ config MCS_FIR
 	  To compile it as a module, choose M here: the module will be called
 	  mcs7780.
 
+config SH_IRDA
+	tristate "SuperH IrDA driver"
+	depends on IRDA && ARCH_SHMOBILE
+	help
+	  Say Y here if your want to enable SuperH IrDA devices.
+
 endmenu
 
diff --git a/trunk/drivers/net/irda/Makefile b/trunk/drivers/net/irda/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_VIA_FIR)		+= via-ircc.o
 obj-$(CONFIG_PXA_FICP)	        += pxaficp_ir.o
 obj-$(CONFIG_MCS_FIR)	        += mcs7780.o
 obj-$(CONFIG_AU1000_FIR)	+= au1k_ir.o
+obj-$(CONFIG_SH_IRDA)		+= sh_irda.o
 # SIR drivers
 obj-$(CONFIG_IRTTY_SIR)		+= irtty-sir.o	sir-dev.o
 obj-$(CONFIG_BFIN_SIR)		+= bfin_sir.o