[kernel] Add missing config options, and make prep really fail when it should

[Chuck Ebbert]

commit 3a78e4bfdec1e658f086d2050a645a9d620528f8
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Sat Jan 29 11:43:08 2011 -0500

    Add missing config options, and make prep really fail when it should

 config-generic |    2 ++
 kernel.spec    |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/config-generic b/config-generic
index 45a0aca..7e50163 100644
--- a/config-generic
+++ b/config-generic
@@ -1597,6 +1597,8 @@ CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_TSCAN1=m
 CONFIG_CAN_SLCAN=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
 # CONFIG_PCH_CAN is not set
 CONFIG_NETROM=m
 CONFIG_ROSE=m
diff --git a/kernel.spec b/kernel.spec
index d9940ab..b4a39ff 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1378,7 +1378,7 @@ do
 %if %{listnewconfig_fail}
   if [ -s .newoptions ]; then
     cat .newoptions
-    exit 0
+    exit 1
   fi
 %endif
   rm -f .newoptions