projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 4e444eb)
configure: ivi_x86_defconfig: remove double assign of CONFIG_CAN_CALC_BITTIMING
authorRicardo Neri <ricardo.neri-calderon@linux.intel.com>
Sat, 27 Sep 2014 00:23:25 +0000 (17:23 -0700)
committerRicardo Neri <ricardo.neri-calderon@linux.intel.com>
Mon, 29 Sep 2014 18:27:27 +0000 (11:27 -0700)
Even though CONFIG_CAN_CALC_BITTIMING is selected as 'y' the commented-out
line causes kbuild to generate a warning about double assignation.
Remove the warning.

Change-Id: Ibb3679e721e188754a2bbdf58d9f8534879740e7
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
arch/x86/configs/ivi_x86_defconfig patch | blob | history

diff --git a/arch/x86/configs/ivi_x86_defconfig b/arch/x86/configs/ivi_x86_defconfig
index 18a5be8..160d29b 100644 (file)
--- a/arch/x86/configs/ivi_x86_defconfig
+++ b/arch/x86/configs/ivi_x86_defconfig
@@ -273,7 +273,6 @@ CONFIG_NET_CLS_CGROUP=m
 CONFIG_CGROUP_NET_PRIO=m
 CONFIG_CAN=m
 CONFIG_CAN_VCAN=m
-# CONFIG_CAN_CALC_BITTIMING is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_BT=m
Domain: System / Uncategorized;