[linux-yocto] [PATCH 2/2] firmware.cfg: clean up bad merge lines

[Saul Wold]

The '+' dont belong here and cause warnings

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 features/firmware/firmware.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/firmware/firmware.cfg b/features/firmware/firmware.cfg
index c8e436c..c013129 100644
--- a/features/firmware/firmware.cfg
+++ b/features/firmware/firmware.cfg
@@ -1,6 +1,6 @@
  #
  # Generic Driver Options
  #
-+CONFIG_FW_LOADER=m
-+CONFIG_FIRMWARE_IN_KERNEL=y
-+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER=m
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
-- 
2.7.4