From 57c8392eee9bc241dc69bc6c6c2f2c7923c567a3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 14 Jul 2009 19:24:10 +0000 Subject: [PATCH] Fixed cmdline override in 2.6.31-rc3 kernel config svn path=/nixpkgs/trunk/; revision=16362 --- pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-amd64 | 4 ++-- pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-i686 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-amd64 b/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-amd64 index 00bf5e6c016..664dbdecd5c 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-amd64 +++ b/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-amd64 @@ -383,9 +383,9 @@ CONFIG_RELOCATABLE=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y CONFIG_COMPAT_VDSO=y -CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE_BOOL=n CONFIG_CMDLINE="" -CONFIG_CMDLINE_OVERRIDE=y +CONFIG_CMDLINE_OVERRIDE=n CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y diff --git a/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-i686 b/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-i686 index 2771da92aa8..a064138aa8c 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-i686 +++ b/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-i686 @@ -371,9 +371,9 @@ CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y CONFIG_COMPAT_VDSO=y -CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE_BOOL=n CONFIG_CMDLINE="" -CONFIG_CMDLINE_OVERRIDE=y +CONFIG_CMDLINE_OVERRIDE=n CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID is not set