Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -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/

drivers/staging/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -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"

drivers/staging/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -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/

drivers/staging/irda/TODO

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line 
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.