From c6be995d46080dd78bf4784fc294b449541e3fa3 Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Mon, 24 Oct 2011 13:40:12 +0200
Subject: [PATCH] --- yaml --- r: 274319 b: refs/heads/master c:
 fd694a1ead63e0818d96ed3c94d91e9796d6390f h: refs/heads/master i:   274317:
 f579e102061b447ae4ac94f033c815d14e72a46d   274315:
 e5b96934daf60cb7dc492f86a065bc8910a4b5bd   274311:
 b545292177394bc92cbaf1921ce2f4cf510cc67a   274303:
 4a74109033ea461778a02e8ca899575bd3b826f3 v: v3

---
 [refs]                   |  2 +-
 trunk/arch/score/Kconfig | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 6b020a361061..a06ef71852f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79fd468200dfc68d8996e94f4f3d5eac832a652b
+refs/heads/master: fd694a1ead63e0818d96ed3c94d91e9796d6390f
diff --git a/trunk/arch/score/Kconfig b/trunk/arch/score/Kconfig
index 288add8d168f..df169e84db4e 100644
--- a/trunk/arch/score/Kconfig
+++ b/trunk/arch/score/Kconfig
@@ -52,16 +52,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_CLOCKEVENTS
 	def_bool y
 
-config SCHED_NO_NO_OMIT_FRAME_POINTER
-	def_bool y
-
-config GENERIC_SYSCALL_TABLE
-	def_bool y
-
-config SCORE_L1_CACHE_SHIFT
-	int
-	default "4"
-
 menu "Kernel type"
 
 config 32BIT
@@ -96,15 +86,6 @@ config STACKTRACE_SUPPORT
 
 source "init/Kconfig"
 
-config PROBE_INITRD_HEADER
-	bool "Probe initrd header created by addinitrd"
-	depends on BLK_DEV_INITRD
-	help
-	  Probe initrd header at the last page of kernel image.
-	  Say Y here if you are using arch/score/boot/addinitrd.c to
-	  add initrd or initramfs image to the kernel image.
-	  Otherwise, say N.
-
 config MMU
 	def_bool y