Commit 70f5c982 authored by David S. Miller's avatar David S. Miller

Merge branch 'irda-move-to-staging'

Greg Kroah-Hartman says:

====================
irda: move it to drivers/staging so we can delete it

The IRDA code has long been obsolete and broken.  So, to keep people
from trying to use it, and to prevent people from having to maintain it,
let's move it to drivers/staging/ so that we can delete it entirely from
the kernel in a few releases.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9d8c7e5a 333b3d07
...@@ -45,7 +45,6 @@ obj-$(CONFIG_ETHERNET) += ethernet/ ...@@ -45,7 +45,6 @@ obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/ obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_HIPPI) += hippi/ obj-$(CONFIG_HIPPI) += hippi/
obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_PLIP) += plip/ obj-$(CONFIG_PLIP) += plip/
obj-$(CONFIG_PPP) += ppp/ obj-$(CONFIG_PPP) += ppp/
obj-$(CONFIG_PPP_ASYNC) += ppp/ obj-$(CONFIG_PPP_ASYNC) += ppp/
......
...@@ -24,6 +24,8 @@ menuconfig STAGING ...@@ -24,6 +24,8 @@ menuconfig STAGING
if STAGING if STAGING
source "drivers/staging/irda/net/Kconfig"
source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/wlan-ng/Kconfig"
source "drivers/staging/comedi/Kconfig" source "drivers/staging/comedi/Kconfig"
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
obj-y += media/ obj-y += media/
obj-y += typec/ obj-y += typec/
obj-$(CONFIG_IRDA) += irda/net/
obj-$(CONFIG_IRDA) += irda/drivers/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_COMEDI) += comedi/
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
......
The irda code will be removed soon from the kernel tree as it is old and
obsolete and broken.
Don't worry about fixing up anything here, it's not needed.
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
# Rewritten to use lists instead of if-statements. # Rewritten to use lists instead of if-statements.
# #
subdir-ccflags-y += -I$(srctree)/drivers/staging/irda/include
# FIR drivers # FIR drivers
obj-$(CONFIG_USB_IRDA) += irda-usb.o obj-$(CONFIG_USB_IRDA) += irda-usb.o
obj-$(CONFIG_SIGMATEL_FIR) += stir4200.o obj-$(CONFIG_SIGMATEL_FIR) += stir4200.o
......
...@@ -27,11 +27,11 @@ menuconfig IRDA ...@@ -27,11 +27,11 @@ menuconfig IRDA
comment "IrDA protocols" comment "IrDA protocols"
depends on IRDA depends on IRDA
source "net/irda/irlan/Kconfig" source "drivers/staging/irda/net/irlan/Kconfig"
source "net/irda/irnet/Kconfig" source "drivers/staging/irda/net/irnet/Kconfig"
source "net/irda/ircomm/Kconfig" source "drivers/staging/irda/net/ircomm/Kconfig"
config IRDA_ULTRA config IRDA_ULTRA
bool "Ultra (connectionless) protocol" bool "Ultra (connectionless) protocol"
...@@ -92,5 +92,5 @@ config IRDA_DEBUG ...@@ -92,5 +92,5 @@ config IRDA_DEBUG
If unsure, say Y (since it makes it easier to find the bugs). If unsure, say Y (since it makes it easier to find the bugs).
source "drivers/net/irda/Kconfig" source "drivers/staging/irda/drivers/Kconfig"
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# Makefile for the Linux IrDA protocol layer. # Makefile for the Linux IrDA protocol layer.
# #
subdir-ccflags-y += -I$(srctree)/drivers/staging/irda/include
obj-$(CONFIG_IRDA) += irda.o obj-$(CONFIG_IRDA) += irda.o
obj-$(CONFIG_IRLAN) += irlan/ obj-$(CONFIG_IRLAN) += irlan/
obj-$(CONFIG_IRNET) += irnet/ obj-$(CONFIG_IRNET) += irnet/
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment