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

Commit a0188177 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull x86nommu update from Greg Ungerer:
 "Only a single change, to remove old Kconfig options from defconfigs"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: defconfig: Cleanup from old Kconfig options
parents 9967468c 354b6382

arch/m68k/configs/m5208evb_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 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_FW_LOADER is not set

arch/m68k/configs/m5249evb_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 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_FW_LOADER is not set

arch/m68k/configs/m5272c3_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 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_FW_LOADER is not set

arch/m68k/configs/m5275evb_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 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_FW_LOADER is not set

arch/m68k/configs/m5307c3_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 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_FW_LOADER is not set