From b4b8a811e8444128c1188fca9ed13198b25cca2e Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Tue, 9 Aug 2011 13:34:53 -0400
Subject: [PATCH] Enable CONFIG_SAMSUNG_LAPTOP (rhbz 729363)

---
 config-x86-generic | 11 ++++++-----
 kernel.spec        |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/config-x86-generic b/config-x86-generic
index 8edfb420a..52ca62d55 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -143,7 +143,6 @@ CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 # CONFIG_ACPI_PROC_EVENT is not set
@@ -293,16 +292,21 @@ CONFIG_HW_RANDOM_VIA=m
 # CONFIG_SGI_IOC4 is not set
 
 CONFIG_X86_PLATFORM_DEVICES=y
+
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
 CONFIG_EEEPC_LAPTOP=m
 CONFIG_EEEPC_WMI=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
+CONFIG_TOPSTAR_LAPTOP=m
+
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -460,8 +464,6 @@ CONFIG_X86_RESERVE_LOW_64K=y
 
 # CONFIG_CMDLINE_BOOL is not set
 
-CONFIG_PANASONIC_LAPTOP=m
-
 CONFIG_X86_PTRACE_BTS=y
 
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -509,7 +511,6 @@ CONFIG_X86_DECODER_SELFTEST=y
 CONFIG_ACPI_CMPC=m
 CONFIG_MSI_WMI=m
 CONFIG_TOSHIBA_BT_RFKILL=m
-# CONFIG_SAMSUNG_LAPTOP is not set
 
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
diff --git a/kernel.spec b/kernel.spec
index 722d86f62..c24909b24 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1897,6 +1897,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Aug 09 2011 Dave Jones <davej@redhat.com>
+- Enable CONFIG_SAMSUNG_LAPTOP (rhbz 729363)
+
 * Mon Aug 08 2011 Josh Boyer <jwboyer@redhat.com>
 - Linux-3.1-rc1-git1