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

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

Merge tag 'samsung-defconfig-4.13-2' of... 

Merge tag 'samsung-defconfig-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Pull "ARM defconfig cleanup" from Krzysztof Kozłowski:

1. Remove old Kconfig options from all ARM configs,
2. Update Samsung defconfigs to bring back options over time got disabled
   for some reason (configs were not updated along with the code),
3. Save defconfigs for Samsung.

* tag 'samsung-defconfig-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: tct_hammer_defconfig: Save defconfig
  ARM: s5pv210_defconfig: Save defconfig
  ARM: s3c6400_defconfig: Save defconfig
  ARM: mini2440_defconfig: Save defconfig
  ARM: s3c2410_defconfig: Save defconfig
  ARM: exynos_defconfig: Save defconfig
  ARM: s5pv210_defconfig: Bring back lost (but wanted) options
  ARM: s3c6400_defconfig: Bring back lost (but wanted) options
  ARM: s3c2410_defconfig: Bring back lost (but wanted) options
  ARM: tct_hammer_defconfig: Bring back lost (but wanted) options
  ARM: mini2440_defconfig: Bring back lost (but wanted) options
  ARM: defconfig: samsung: Re-order entries to match savedefconfig
  ARM: defconfig: Cleanup from old Kconfig options
parents 125370a9 794b7773

arch/arm/configs/acs5k_defconfig

+0 −8
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -30,13 +29,9 @@ CONFIG_UNIX=y 
CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y
@@ -49,8 +44,6 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_ARM_KS8695_ETHER=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_PRISM54=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set
@@ -69,7 +62,6 @@ CONFIG_KS8695_WATCHDOG=y 
CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_EXT2_FS=y

CONFIG_INOTIFY=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

arch/arm/configs/acs5k_tiny_defconfig

+0 −10
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -25,13 +24,9 @@ CONFIG_INET=y 
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y
@@ -40,12 +35,9 @@ CONFIG_MTD_CFI_INTELEXT=y 
CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP=y

# CONFIG_BLK_DEV is not set

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_ARM_KS8695_ETHER=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set
@@ -62,11 +54,9 @@ CONFIG_GPIO_PCA953X=y 
CONFIG_WATCHDOG=y

CONFIG_KS8695_WATCHDOG=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_INOTIFY=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

arch/arm/configs/am200epdkit_defconfig

+0 −7
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_LOCALVERSION="gum"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y
@@ -30,12 +29,9 @@ CONFIG_INET=y 
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_BT=m

CONFIG_BT_L2CAP=m

CONFIG_BT_SCO=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=m
@@ -43,7 +39,6 @@ CONFIG_BT_HCIUART=m 
CONFIG_BT_HCIUART_H4=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -88,7 +83,6 @@ CONFIG_USB_ETH=m 
CONFIG_MMC=y

CONFIG_MMC_PXA=y

# CONFIG_DNOTIFY is not set

CONFIG_INOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y
@@ -101,7 +95,6 @@ CONFIG_DEBUG_KERNEL=y 
# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_CRYPTO=y

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_ECB=m

arch/arm/configs/assabet_defconfig

+0 −3
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y
@@ -22,9 +21,7 @@ CONFIG_IRDA=m 
CONFIG_IRLAN=m

CONFIG_SA1100_FIR=m

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

arch/arm/configs/axm55xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_NETWORK_PHY_TIMESTAMPING=y

CONFIG_BRIDGE=y