blob: 3435796f1fb93adba31daeb5ee1d255d74430cb4 [file] [log] [blame]
From 0da98a41ea04b1786dfc06622733471d47c68110 Mon Sep 17 00:00:00 2001
From: Simon Horman <horms+renesas@verge.net.au>
Date: Thu, 10 Oct 2013 15:12:17 +0900
Subject: ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig
CONFIG_PACKET is required for the ISC dhcpd daemon function.
This change brings the marzen defconfig into line with
other shmobile defconfigs.
Signed-off-by: Simon Horman <horms@verge.net.au>
(cherry picked from commit d4df4b2716336d24e243013c5e64b867c18ccc29)
(Queued by ARM-SoC for v3.14 but not yet in Linus's tree)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/configs/marzen_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 3f0f41f8ba30..a423badba241 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -35,6 +35,7 @@ CONFIG_KEXEC=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_PM_RUNTIME=y
CONFIG_NET=y
+CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_PNP=y
--
1.8.5.rc3