Browse Source

irda: move net/irda/ to drivers/staging/irda/net/

It's time to get rid of IRDA.  It's long been broken, and no one seems
to use it anymore.  So move it to staging and after a while, we can
delete it from there.

To start, move the network irda core from net/irda to
drivers/staging/irda/net/

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Greg Kroah-Hartman 8 years ago
parent
commit
1ca163afb6
55 changed files with 6 additions and 5 deletions
  1. 2 0
      drivers/staging/Kconfig
  2. 1 0
      drivers/staging/Makefile
  3. 3 3
      drivers/staging/irda/net/Kconfig
  4. 0 0
      drivers/staging/irda/net/Makefile
  5. 0 0
      drivers/staging/irda/net/af_irda.c
  6. 0 0
      drivers/staging/irda/net/discovery.c
  7. 0 0
      drivers/staging/irda/net/ircomm/Kconfig
  8. 0 0
      drivers/staging/irda/net/ircomm/Makefile
  9. 0 0
      drivers/staging/irda/net/ircomm/ircomm_core.c
  10. 0 0
      drivers/staging/irda/net/ircomm/ircomm_event.c
  11. 0 0
      drivers/staging/irda/net/ircomm/ircomm_lmp.c
  12. 0 0
      drivers/staging/irda/net/ircomm/ircomm_param.c
  13. 0 0
      drivers/staging/irda/net/ircomm/ircomm_ttp.c
  14. 0 0
      drivers/staging/irda/net/ircomm/ircomm_tty.c
  15. 0 0
      drivers/staging/irda/net/ircomm/ircomm_tty_attach.c
  16. 0 0
      drivers/staging/irda/net/ircomm/ircomm_tty_ioctl.c
  17. 0 0
      drivers/staging/irda/net/irda_device.c
  18. 0 0
      drivers/staging/irda/net/iriap.c
  19. 0 0
      drivers/staging/irda/net/iriap_event.c
  20. 0 0
      drivers/staging/irda/net/irias_object.c
  21. 0 0
      drivers/staging/irda/net/irlan/Kconfig
  22. 0 0
      drivers/staging/irda/net/irlan/Makefile
  23. 0 0
      drivers/staging/irda/net/irlan/irlan_client.c
  24. 0 0
      drivers/staging/irda/net/irlan/irlan_client_event.c
  25. 0 0
      drivers/staging/irda/net/irlan/irlan_common.c
  26. 0 0
      drivers/staging/irda/net/irlan/irlan_eth.c
  27. 0 0
      drivers/staging/irda/net/irlan/irlan_event.c
  28. 0 0
      drivers/staging/irda/net/irlan/irlan_filter.c
  29. 0 0
      drivers/staging/irda/net/irlan/irlan_provider.c
  30. 0 0
      drivers/staging/irda/net/irlan/irlan_provider_event.c
  31. 0 0
      drivers/staging/irda/net/irlap.c
  32. 0 0
      drivers/staging/irda/net/irlap_event.c
  33. 0 0
      drivers/staging/irda/net/irlap_frame.c
  34. 0 0
      drivers/staging/irda/net/irlmp.c
  35. 0 0
      drivers/staging/irda/net/irlmp_event.c
  36. 0 0
      drivers/staging/irda/net/irlmp_frame.c
  37. 0 0
      drivers/staging/irda/net/irmod.c
  38. 0 0
      drivers/staging/irda/net/irnet/Kconfig
  39. 0 0
      drivers/staging/irda/net/irnet/Makefile
  40. 0 0
      drivers/staging/irda/net/irnet/irnet.h
  41. 0 0
      drivers/staging/irda/net/irnet/irnet_irda.c
  42. 0 0
      drivers/staging/irda/net/irnet/irnet_irda.h
  43. 0 0
      drivers/staging/irda/net/irnet/irnet_ppp.c
  44. 0 0
      drivers/staging/irda/net/irnet/irnet_ppp.h
  45. 0 0
      drivers/staging/irda/net/irnetlink.c
  46. 0 0
      drivers/staging/irda/net/irproc.c
  47. 0 0
      drivers/staging/irda/net/irqueue.c
  48. 0 0
      drivers/staging/irda/net/irsysctl.c
  49. 0 0
      drivers/staging/irda/net/irttp.c
  50. 0 0
      drivers/staging/irda/net/parameters.c
  51. 0 0
      drivers/staging/irda/net/qos.c
  52. 0 0
      drivers/staging/irda/net/timer.c
  53. 0 0
      drivers/staging/irda/net/wrapper.c
  54. 0 1
      net/Kconfig
  55. 0 1
      net/Makefile

+ 2 - 0
drivers/staging/Kconfig

@@ -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"

+ 1 - 0
drivers/staging/Makefile

@@ -2,6 +2,7 @@
 
 
 obj-y				+= media/
 obj-y				+= media/
 obj-y				+= typec/
 obj-y				+= typec/
+obj-$(CONFIG_IRDA)		+= irda/net/
 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/

+ 3 - 3
net/irda/Kconfig → drivers/staging/irda/net/Kconfig

@@ -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"

+ 0 - 0
net/irda/Makefile → drivers/staging/irda/net/Makefile


+ 0 - 0
net/irda/af_irda.c → drivers/staging/irda/net/af_irda.c


+ 0 - 0
net/irda/discovery.c → drivers/staging/irda/net/discovery.c


+ 0 - 0
net/irda/ircomm/Kconfig → drivers/staging/irda/net/ircomm/Kconfig


+ 0 - 0
net/irda/ircomm/Makefile → drivers/staging/irda/net/ircomm/Makefile


+ 0 - 0
net/irda/ircomm/ircomm_core.c → drivers/staging/irda/net/ircomm/ircomm_core.c


+ 0 - 0
net/irda/ircomm/ircomm_event.c → drivers/staging/irda/net/ircomm/ircomm_event.c


+ 0 - 0
net/irda/ircomm/ircomm_lmp.c → drivers/staging/irda/net/ircomm/ircomm_lmp.c


+ 0 - 0
net/irda/ircomm/ircomm_param.c → drivers/staging/irda/net/ircomm/ircomm_param.c


+ 0 - 0
net/irda/ircomm/ircomm_ttp.c → drivers/staging/irda/net/ircomm/ircomm_ttp.c


+ 0 - 0
net/irda/ircomm/ircomm_tty.c → drivers/staging/irda/net/ircomm/ircomm_tty.c


+ 0 - 0
net/irda/ircomm/ircomm_tty_attach.c → drivers/staging/irda/net/ircomm/ircomm_tty_attach.c


+ 0 - 0
net/irda/ircomm/ircomm_tty_ioctl.c → drivers/staging/irda/net/ircomm/ircomm_tty_ioctl.c


+ 0 - 0
net/irda/irda_device.c → drivers/staging/irda/net/irda_device.c


+ 0 - 0
net/irda/iriap.c → drivers/staging/irda/net/iriap.c


+ 0 - 0
net/irda/iriap_event.c → drivers/staging/irda/net/iriap_event.c


+ 0 - 0
net/irda/irias_object.c → drivers/staging/irda/net/irias_object.c


+ 0 - 0
net/irda/irlan/Kconfig → drivers/staging/irda/net/irlan/Kconfig


+ 0 - 0
net/irda/irlan/Makefile → drivers/staging/irda/net/irlan/Makefile


+ 0 - 0
net/irda/irlan/irlan_client.c → drivers/staging/irda/net/irlan/irlan_client.c


+ 0 - 0
net/irda/irlan/irlan_client_event.c → drivers/staging/irda/net/irlan/irlan_client_event.c


+ 0 - 0
net/irda/irlan/irlan_common.c → drivers/staging/irda/net/irlan/irlan_common.c


+ 0 - 0
net/irda/irlan/irlan_eth.c → drivers/staging/irda/net/irlan/irlan_eth.c


+ 0 - 0
net/irda/irlan/irlan_event.c → drivers/staging/irda/net/irlan/irlan_event.c


+ 0 - 0
net/irda/irlan/irlan_filter.c → drivers/staging/irda/net/irlan/irlan_filter.c


+ 0 - 0
net/irda/irlan/irlan_provider.c → drivers/staging/irda/net/irlan/irlan_provider.c


+ 0 - 0
net/irda/irlan/irlan_provider_event.c → drivers/staging/irda/net/irlan/irlan_provider_event.c


+ 0 - 0
net/irda/irlap.c → drivers/staging/irda/net/irlap.c


+ 0 - 0
net/irda/irlap_event.c → drivers/staging/irda/net/irlap_event.c


+ 0 - 0
net/irda/irlap_frame.c → drivers/staging/irda/net/irlap_frame.c


+ 0 - 0
net/irda/irlmp.c → drivers/staging/irda/net/irlmp.c


+ 0 - 0
net/irda/irlmp_event.c → drivers/staging/irda/net/irlmp_event.c


+ 0 - 0
net/irda/irlmp_frame.c → drivers/staging/irda/net/irlmp_frame.c


+ 0 - 0
net/irda/irmod.c → drivers/staging/irda/net/irmod.c


+ 0 - 0
net/irda/irnet/Kconfig → drivers/staging/irda/net/irnet/Kconfig


+ 0 - 0
net/irda/irnet/Makefile → drivers/staging/irda/net/irnet/Makefile


+ 0 - 0
net/irda/irnet/irnet.h → drivers/staging/irda/net/irnet/irnet.h


+ 0 - 0
net/irda/irnet/irnet_irda.c → drivers/staging/irda/net/irnet/irnet_irda.c


+ 0 - 0
net/irda/irnet/irnet_irda.h → drivers/staging/irda/net/irnet/irnet_irda.h


+ 0 - 0
net/irda/irnet/irnet_ppp.c → drivers/staging/irda/net/irnet/irnet_ppp.c


+ 0 - 0
net/irda/irnet/irnet_ppp.h → drivers/staging/irda/net/irnet/irnet_ppp.h


+ 0 - 0
net/irda/irnetlink.c → drivers/staging/irda/net/irnetlink.c


+ 0 - 0
net/irda/irproc.c → drivers/staging/irda/net/irproc.c


+ 0 - 0
net/irda/irqueue.c → drivers/staging/irda/net/irqueue.c


+ 0 - 0
net/irda/irsysctl.c → drivers/staging/irda/net/irsysctl.c


+ 0 - 0
net/irda/irttp.c → drivers/staging/irda/net/irttp.c


+ 0 - 0
net/irda/parameters.c → drivers/staging/irda/net/parameters.c


+ 0 - 0
net/irda/qos.c → drivers/staging/irda/net/qos.c


+ 0 - 0
net/irda/timer.c → drivers/staging/irda/net/timer.c


+ 0 - 0
net/irda/wrapper.c → drivers/staging/irda/net/wrapper.c


+ 0 - 1
net/Kconfig

@@ -376,7 +376,6 @@ endmenu
 
 
 source "net/ax25/Kconfig"
 source "net/ax25/Kconfig"
 source "net/can/Kconfig"
 source "net/can/Kconfig"
-source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"
 source "net/rxrpc/Kconfig"
 source "net/kcm/Kconfig"
 source "net/kcm/Kconfig"

+ 0 - 1
net/Makefile

@@ -31,7 +31,6 @@ obj-$(CONFIG_NETROM)		+= netrom/
 obj-$(CONFIG_ROSE)		+= rose/
 obj-$(CONFIG_ROSE)		+= rose/
 obj-$(CONFIG_AX25)		+= ax25/
 obj-$(CONFIG_AX25)		+= ax25/
 obj-$(CONFIG_CAN)		+= can/
 obj-$(CONFIG_CAN)		+= can/
-obj-$(CONFIG_IRDA)		+= irda/
 obj-$(CONFIG_BT)		+= bluetooth/
 obj-$(CONFIG_BT)		+= bluetooth/
 obj-$(CONFIG_SUNRPC)		+= sunrpc/
 obj-$(CONFIG_SUNRPC)		+= sunrpc/
 obj-$(CONFIG_AF_RXRPC)		+= rxrpc/
 obj-$(CONFIG_AF_RXRPC)		+= rxrpc/