diff options
-rw-r--r-- | drivers/net/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/Kconfig (renamed from drivers/net/irda/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/Makefile (renamed from drivers/net/irda/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/act200l-sir.c (renamed from drivers/net/irda/act200l-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/actisys-sir.c (renamed from drivers/net/irda/actisys-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/ali-ircc.c (renamed from drivers/net/irda/ali-ircc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/ali-ircc.h (renamed from drivers/net/irda/ali-ircc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/au1k_ir.c (renamed from drivers/net/irda/au1k_ir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/bfin_sir.c (renamed from drivers/net/irda/bfin_sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/bfin_sir.h (renamed from drivers/net/irda/bfin_sir.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/donauboe.c (renamed from drivers/net/irda/donauboe.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/donauboe.h (renamed from drivers/net/irda/donauboe.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/esi-sir.c (renamed from drivers/net/irda/esi-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/girbil-sir.c (renamed from drivers/net/irda/girbil-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/irda-usb.c (renamed from drivers/net/irda/irda-usb.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/irda-usb.h (renamed from drivers/net/irda/irda-usb.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/irtty-sir.c (renamed from drivers/net/irda/irtty-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/irtty-sir.h (renamed from drivers/net/irda/irtty-sir.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/kingsun-sir.c (renamed from drivers/net/irda/kingsun-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/ks959-sir.c (renamed from drivers/net/irda/ks959-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/ksdazzle-sir.c (renamed from drivers/net/irda/ksdazzle-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/litelink-sir.c (renamed from drivers/net/irda/litelink-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/ma600-sir.c (renamed from drivers/net/irda/ma600-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/mcp2120-sir.c (renamed from drivers/net/irda/mcp2120-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/mcs7780.c (renamed from drivers/net/irda/mcs7780.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/mcs7780.h (renamed from drivers/net/irda/mcs7780.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/nsc-ircc.c (renamed from drivers/net/irda/nsc-ircc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/nsc-ircc.h (renamed from drivers/net/irda/nsc-ircc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/old_belkin-sir.c (renamed from drivers/net/irda/old_belkin-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/pxaficp_ir.c (renamed from drivers/net/irda/pxaficp_ir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/sa1100_ir.c (renamed from drivers/net/irda/sa1100_ir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/sh_sir.c (renamed from drivers/net/irda/sh_sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/sir-dev.h (renamed from drivers/net/irda/sir-dev.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/sir_dev.c (renamed from drivers/net/irda/sir_dev.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/sir_dongle.c (renamed from drivers/net/irda/sir_dongle.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/smsc-ircc2.c (renamed from drivers/net/irda/smsc-ircc2.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/smsc-ircc2.h (renamed from drivers/net/irda/smsc-ircc2.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/smsc-sio.h (renamed from drivers/net/irda/smsc-sio.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/stir4200.c (renamed from drivers/net/irda/stir4200.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/tekram-sir.c (renamed from drivers/net/irda/tekram-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/toim3232-sir.c (renamed from drivers/net/irda/toim3232-sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/via-ircc.c (renamed from drivers/net/irda/via-ircc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/via-ircc.h (renamed from drivers/net/irda/via-ircc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/vlsi_ir.c (renamed from drivers/net/irda/vlsi_ir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/vlsi_ir.h (renamed from drivers/net/irda/vlsi_ir.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/w83977af.h (renamed from drivers/net/irda/w83977af.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/w83977af_ir.c (renamed from drivers/net/irda/w83977af_ir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/drivers/w83977af_ir.h (renamed from drivers/net/irda/w83977af_ir.h) | 0 | ||||
-rw-r--r-- | drivers/staging/irda/net/Kconfig | 2 |
50 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index b2f6556d8848..8dff900085d6 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -45,7 +45,6 @@ obj-$(CONFIG_ETHERNET) += ethernet/ obj-$(CONFIG_FDDI) += fddi/ obj-$(CONFIG_HIPPI) += hippi/ obj-$(CONFIG_HAMRADIO) += hamradio/ -obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_PLIP) += plip/ obj-$(CONFIG_PPP) += ppp/ obj-$(CONFIG_PPP_ASYNC) += ppp/ diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 509fbacf9a7e..fced929a0e67 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -3,6 +3,7 @@ obj-y += media/ obj-y += typec/ obj-$(CONFIG_IRDA) += irda/net/ +obj-$(CONFIG_IRDA) += irda/drivers/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ diff --git a/drivers/net/irda/Kconfig b/drivers/staging/irda/drivers/Kconfig index e070e1222733..e070e1222733 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/staging/irda/drivers/Kconfig diff --git a/drivers/net/irda/Makefile b/drivers/staging/irda/drivers/Makefile index 4c344433dae5..4c344433dae5 100644 --- a/drivers/net/irda/Makefile +++ b/drivers/staging/irda/drivers/Makefile diff --git a/drivers/net/irda/act200l-sir.c b/drivers/staging/irda/drivers/act200l-sir.c index e8917511e1aa..e8917511e1aa 100644 --- a/drivers/net/irda/act200l-sir.c +++ b/drivers/staging/irda/drivers/act200l-sir.c diff --git a/drivers/net/irda/actisys-sir.c b/drivers/staging/irda/drivers/actisys-sir.c index e224b8b99517..e224b8b99517 100644 --- a/drivers/net/irda/actisys-sir.c +++ b/drivers/staging/irda/drivers/actisys-sir.c diff --git a/drivers/net/irda/ali-ircc.c b/drivers/staging/irda/drivers/ali-ircc.c index 35f198d83701..35f198d83701 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/staging/irda/drivers/ali-ircc.c diff --git a/drivers/net/irda/ali-ircc.h b/drivers/staging/irda/drivers/ali-ircc.h index c2d9747a5108..c2d9747a5108 100644 --- a/drivers/net/irda/ali-ircc.h +++ b/drivers/staging/irda/drivers/ali-ircc.h diff --git a/drivers/net/irda/au1k_ir.c b/drivers/staging/irda/drivers/au1k_ir.c index be4ea6aa57a9..be4ea6aa57a9 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/staging/irda/drivers/au1k_ir.c diff --git a/drivers/net/irda/bfin_sir.c b/drivers/staging/irda/drivers/bfin_sir.c index 3151b580dbd6..3151b580dbd6 100644 --- a/drivers/net/irda/bfin_sir.c +++ b/drivers/staging/irda/drivers/bfin_sir.c diff --git a/drivers/net/irda/bfin_sir.h b/drivers/staging/irda/drivers/bfin_sir.h index d47cf14bb4a5..d47cf14bb4a5 100644 --- a/drivers/net/irda/bfin_sir.h +++ b/drivers/staging/irda/drivers/bfin_sir.h diff --git a/drivers/net/irda/donauboe.c b/drivers/staging/irda/drivers/donauboe.c index b337e6d23a88..b337e6d23a88 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/staging/irda/drivers/donauboe.c diff --git a/drivers/net/irda/donauboe.h b/drivers/staging/irda/drivers/donauboe.h index d92d54e839b9..d92d54e839b9 100644 --- a/drivers/net/irda/donauboe.h +++ b/drivers/staging/irda/drivers/donauboe.h diff --git a/drivers/net/irda/esi-sir.c b/drivers/staging/irda/drivers/esi-sir.c index 019a3e848bcb..019a3e848bcb 100644 --- a/drivers/net/irda/esi-sir.c +++ b/drivers/staging/irda/drivers/esi-sir.c diff --git a/drivers/net/irda/girbil-sir.c b/drivers/staging/irda/drivers/girbil-sir.c index 7e0a5b8c6d53..7e0a5b8c6d53 100644 --- a/drivers/net/irda/girbil-sir.c +++ b/drivers/staging/irda/drivers/girbil-sir.c diff --git a/drivers/net/irda/irda-usb.c b/drivers/staging/irda/drivers/irda-usb.c index 723e49bc4baa..723e49bc4baa 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/staging/irda/drivers/irda-usb.c diff --git a/drivers/net/irda/irda-usb.h b/drivers/staging/irda/drivers/irda-usb.h index 8ac389fa9348..8ac389fa9348 100644 --- a/drivers/net/irda/irda-usb.h +++ b/drivers/staging/irda/drivers/irda-usb.h diff --git a/drivers/net/irda/irtty-sir.c b/drivers/staging/irda/drivers/irtty-sir.c index 7a20a9a4663a..7a20a9a4663a 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/staging/irda/drivers/irtty-sir.c diff --git a/drivers/net/irda/irtty-sir.h b/drivers/staging/irda/drivers/irtty-sir.h index b132d8f6eb13..b132d8f6eb13 100644 --- a/drivers/net/irda/irtty-sir.h +++ b/drivers/staging/irda/drivers/irtty-sir.h diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/staging/irda/drivers/kingsun-sir.c index 4fd4ac2fe09f..4fd4ac2fe09f 100644 --- a/drivers/net/irda/kingsun-sir.c +++ b/drivers/staging/irda/drivers/kingsun-sir.c diff --git a/drivers/net/irda/ks959-sir.c b/drivers/staging/irda/drivers/ks959-sir.c index 8025741e7586..8025741e7586 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/staging/irda/drivers/ks959-sir.c diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/staging/irda/drivers/ksdazzle-sir.c index d2a0755df596..d2a0755df596 100644 --- a/drivers/net/irda/ksdazzle-sir.c +++ b/drivers/staging/irda/drivers/ksdazzle-sir.c diff --git a/drivers/net/irda/litelink-sir.c b/drivers/staging/irda/drivers/litelink-sir.c index 8eefcb44bac3..8eefcb44bac3 100644 --- a/drivers/net/irda/litelink-sir.c +++ b/drivers/staging/irda/drivers/litelink-sir.c diff --git a/drivers/net/irda/ma600-sir.c b/drivers/staging/irda/drivers/ma600-sir.c index a764817b47f1..a764817b47f1 100644 --- a/drivers/net/irda/ma600-sir.c +++ b/drivers/staging/irda/drivers/ma600-sir.c diff --git a/drivers/net/irda/mcp2120-sir.c b/drivers/staging/irda/drivers/mcp2120-sir.c index 2e33f91bfe8f..2e33f91bfe8f 100644 --- a/drivers/net/irda/mcp2120-sir.c +++ b/drivers/staging/irda/drivers/mcp2120-sir.c diff --git a/drivers/net/irda/mcs7780.c b/drivers/staging/irda/drivers/mcs7780.c index c3f0b254b344..c3f0b254b344 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/staging/irda/drivers/mcs7780.c diff --git a/drivers/net/irda/mcs7780.h b/drivers/staging/irda/drivers/mcs7780.h index a6e8f7dbafc9..a6e8f7dbafc9 100644 --- a/drivers/net/irda/mcs7780.h +++ b/drivers/staging/irda/drivers/mcs7780.h diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/staging/irda/drivers/nsc-ircc.c index 7beae147be11..7beae147be11 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/staging/irda/drivers/nsc-ircc.c diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/staging/irda/drivers/nsc-ircc.h index 7be5acb56532..7be5acb56532 100644 --- a/drivers/net/irda/nsc-ircc.h +++ b/drivers/staging/irda/drivers/nsc-ircc.h diff --git a/drivers/net/irda/old_belkin-sir.c b/drivers/staging/irda/drivers/old_belkin-sir.c index a7c2e990ae69..a7c2e990ae69 100644 --- a/drivers/net/irda/old_belkin-sir.c +++ b/drivers/staging/irda/drivers/old_belkin-sir.c diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/staging/irda/drivers/pxaficp_ir.c index 1dba16bc7f8d..1dba16bc7f8d 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/staging/irda/drivers/pxaficp_ir.c diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/staging/irda/drivers/sa1100_ir.c index b6e44ff4e373..b6e44ff4e373 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/staging/irda/drivers/sa1100_ir.c diff --git a/drivers/net/irda/sh_sir.c b/drivers/staging/irda/drivers/sh_sir.c index fede6864c737..fede6864c737 100644 --- a/drivers/net/irda/sh_sir.c +++ b/drivers/staging/irda/drivers/sh_sir.c diff --git a/drivers/net/irda/sir-dev.h b/drivers/staging/irda/drivers/sir-dev.h index f50b9c1c0639..f50b9c1c0639 100644 --- a/drivers/net/irda/sir-dev.h +++ b/drivers/staging/irda/drivers/sir-dev.h diff --git a/drivers/net/irda/sir_dev.c b/drivers/staging/irda/drivers/sir_dev.c index 6af26a7d787c..6af26a7d787c 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/staging/irda/drivers/sir_dev.c diff --git a/drivers/net/irda/sir_dongle.c b/drivers/staging/irda/drivers/sir_dongle.c index 7436f73ff1bb..7436f73ff1bb 100644 --- a/drivers/net/irda/sir_dongle.c +++ b/drivers/staging/irda/drivers/sir_dongle.c diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/staging/irda/drivers/smsc-ircc2.c index 19a55cba6beb..19a55cba6beb 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/staging/irda/drivers/smsc-ircc2.c diff --git a/drivers/net/irda/smsc-ircc2.h b/drivers/staging/irda/drivers/smsc-ircc2.h index 4829fa22cb29..4829fa22cb29 100644 --- a/drivers/net/irda/smsc-ircc2.h +++ b/drivers/staging/irda/drivers/smsc-ircc2.h diff --git a/drivers/net/irda/smsc-sio.h b/drivers/staging/irda/drivers/smsc-sio.h index 59e20e653ebe..59e20e653ebe 100644 --- a/drivers/net/irda/smsc-sio.h +++ b/drivers/staging/irda/drivers/smsc-sio.h diff --git a/drivers/net/irda/stir4200.c b/drivers/staging/irda/drivers/stir4200.c index ee2cb70b688d..ee2cb70b688d 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/staging/irda/drivers/stir4200.c diff --git a/drivers/net/irda/tekram-sir.c b/drivers/staging/irda/drivers/tekram-sir.c index 9dcf0c103b9d..9dcf0c103b9d 100644 --- a/drivers/net/irda/tekram-sir.c +++ b/drivers/staging/irda/drivers/tekram-sir.c diff --git a/drivers/net/irda/toim3232-sir.c b/drivers/staging/irda/drivers/toim3232-sir.c index b977d6d33e74..b977d6d33e74 100644 --- a/drivers/net/irda/toim3232-sir.c +++ b/drivers/staging/irda/drivers/toim3232-sir.c diff --git a/drivers/net/irda/via-ircc.c b/drivers/staging/irda/drivers/via-ircc.c index ca4442a9d631..ca4442a9d631 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/staging/irda/drivers/via-ircc.c diff --git a/drivers/net/irda/via-ircc.h b/drivers/staging/irda/drivers/via-ircc.h index ac1525573398..ac1525573398 100644 --- a/drivers/net/irda/via-ircc.h +++ b/drivers/staging/irda/drivers/via-ircc.h diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/staging/irda/drivers/vlsi_ir.c index 6638784c082e..6638784c082e 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/staging/irda/drivers/vlsi_ir.c diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/staging/irda/drivers/vlsi_ir.h index f9db2ce4c5c6..f9db2ce4c5c6 100644 --- a/drivers/net/irda/vlsi_ir.h +++ b/drivers/staging/irda/drivers/vlsi_ir.h diff --git a/drivers/net/irda/w83977af.h b/drivers/staging/irda/drivers/w83977af.h index 04476c2e9121..04476c2e9121 100644 --- a/drivers/net/irda/w83977af.h +++ b/drivers/staging/irda/drivers/w83977af.h diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/staging/irda/drivers/w83977af_ir.c index 282b6c9ae05b..282b6c9ae05b 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/staging/irda/drivers/w83977af_ir.c diff --git a/drivers/net/irda/w83977af_ir.h b/drivers/staging/irda/drivers/w83977af_ir.h index fefe9b11e200..fefe9b11e200 100644 --- a/drivers/net/irda/w83977af_ir.h +++ b/drivers/staging/irda/drivers/w83977af_ir.h diff --git a/drivers/staging/irda/net/Kconfig b/drivers/staging/irda/net/Kconfig index cd775e1ea0e9..6abeae6c666a 100644 --- a/drivers/staging/irda/net/Kconfig +++ b/drivers/staging/irda/net/Kconfig @@ -92,5 +92,5 @@ config IRDA_DEBUG If unsure, say Y (since it makes it easier to find the bugs). -source "drivers/net/irda/Kconfig" +source "drivers/staging/irda/drivers/Kconfig" |