summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2003-10-01 17:28:48 +0000
committerRonald G. Minnich <rminnich@gmail.com>2003-10-01 17:28:48 +0000
commit6358a4a0030f074af76f6bf8dbf5725e11a3b3c0 (patch)
tree6348549c93945037b7657c3e35d4a36429c8d443 /src/config
parent848d336534edb7996047fb69811d3b5d922d40ef (diff)
default USE_FALLBACK_IMAGE to 0
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1170 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/config')
-rw-r--r--src/config/Options.lb4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/config/Options.lb b/src/config/Options.lb
index c5363d0f5a..cfc8670d69 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -184,12 +184,8 @@ define HAVE_FALLBACK_BOOT
comment "Set if fallback booting required"
end
define USE_FALLBACK_IMAGE
-<<<<<<< Options.lb
format "%d"
default 0
-=======
- default 1
->>>>>>> 1.23
export used
comment "Set to build a fallback image"
end