Commit f0993936 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: defconfig: remove irda remnants 



A couple of ARM defconfig files (and one for sh) still refer to the
IRDA options that were removed in linux-4.14. Remove the entries
as well now.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 2002f396

arch/arm/configs/assabet_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ CONFIG_NET=y 
CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_IRDA=m

CONFIG_IRLAN=m

CONFIG_SA1100_FIR=m

CONFIG_PCCARD=y

CONFIG_PCMCIA_SA1100=y

CONFIG_MTD=y

arch/arm/configs/badge4_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_IRDA=y

CONFIG_IRLAN=y

CONFIG_IRCOMM=y

CONFIG_IRDA_ULTRA=y

CONFIG_SA1100_FIR=y

CONFIG_BT=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIVHCI=m

arch/arm/configs/clps711x_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_IRDA=y

CONFIG_IRTTY_SIR=y

# CONFIG_WIRELESS is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

arch/arm/configs/colibri_pxa270_defconfig

+0 −7
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ CONFIG_IP_PNP_BOOTP=y 
# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_VLAN_8021Q=m

CONFIG_IRDA=m

CONFIG_IRLAN=m

CONFIG_IRCOMM=m

CONFIG_IRDA_ULTRA=y

CONFIG_IRDA_CACHE_LAST_LSAP=y

CONFIG_IRDA_FAST_RR=y

CONFIG_IRTTY_SIR=m

CONFIG_BT=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_RFCOMM_TTY=y

arch/arm/configs/corgi_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -56,11 +56,6 @@ CONFIG_IP6_NF_MATCH_RT=m 
CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IRDA=m

CONFIG_IRLAN=m

CONFIG_IRNET=m

CONFIG_IRCOMM=m

CONFIG_PXA_FICP=m

CONFIG_BT=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_RFCOMM_TTY=y