[kernel] r16751 - in dists/sid/linux-2.6/debian: . patches/features/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Sun Jan  2 23:27:09 2011
New Revision: 16751

Log:
[x86] dell-laptop: Enable for some newer Dell models

Added:
   dists/sid/linux-2.6/debian/patches/features/x86/dell-laptop-Add-Dell-Computer-type-8-to-DMI-whitelist.patch
   dists/sid/linux-2.6/debian/patches/features/x86/dell-laptop-Add-Dell-Inc-type-9-to-DMI-whitelist.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Jan  2 23:08:35 2011	(r16750)
+++ dists/sid/linux-2.6/debian/changelog	Sun Jan  2 23:27:09 2011	(r16751)
@@ -18,6 +18,7 @@
   * rt28x0: Add ieee80211_regdom module parameter mimicking cfg80211 as a
     workaround for incorrect region code in NVRAM (Closes: #594561)
   * btrfs: Require CAP_SYS_ADMIN for filesystem rebalance (Closes: #608185)
+  * [x86] dell-laptop: Enable for some newer Dell models
 
   [ maximilian attems ]
   * [openvz] Reenable NF_CONNTRACK_IPV6. (closes: #580507)

Added: dists/sid/linux-2.6/debian/patches/features/x86/dell-laptop-Add-Dell-Computer-type-8-to-DMI-whitelist.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/dell-laptop-Add-Dell-Computer-type-8-to-DMI-whitelist.patch	Sun Jan  2 23:27:09 2011	(r16751)
@@ -0,0 +1,41 @@
+From: Erik Andren <erik.andren at gmail.com>
+Date: Sun, 14 Feb 2010 11:53:23 -0500
+Subject: [PATCH] dell-laptop: Add another Dell laptop to the DMI whitelist
+
+commit cb6a7937f4328a267e0806680ade500ed2c3c01a upstream.
+
+The Latitude C640 has another variation of dell in its DMI vendor entry.
+Add it to the whitelist in order to enjoy the sweet fruits of software
+backlight toggling.
+
+Signed-off-by: Erik Andren <erik.andren at gmail.com>
+---
+ drivers/platform/x86/dell-laptop.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
+index 04b2ddb..b7f4d27 100644
+--- a/drivers/platform/x86/dell-laptop.c
++++ b/drivers/platform/x86/dell-laptop.c
+@@ -81,6 +81,13 @@ static const struct dmi_system_id __initdata dell_device_table[] = {
+ 			DMI_MATCH(DMI_CHASSIS_TYPE, "8"),
+ 		},
+ 	},
++	{
++		.ident = "Dell Computer Corporation",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
++			DMI_MATCH(DMI_CHASSIS_TYPE, "8"),
++		},
++	},
+ 	{ }
+ };
+ 
+@@ -609,3 +616,4 @@ MODULE_AUTHOR("Matthew Garrett <mjg at redhat.com>");
+ MODULE_DESCRIPTION("Dell laptop driver");
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*");
++MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*");
+-- 
+1.7.2.3
+

Added: dists/sid/linux-2.6/debian/patches/features/x86/dell-laptop-Add-Dell-Inc-type-9-to-DMI-whitelist.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/dell-laptop-Add-Dell-Inc-type-9-to-DMI-whitelist.patch	Sun Jan  2 23:27:09 2011	(r16751)
@@ -0,0 +1,40 @@
+From: Rezwanul Kabir <Rezwanul_Kabir at dell.com>
+Date: Wed, 23 Jun 2010 12:02:43 -0500
+Subject: [PATCH] dell-laptop: Add another Dell laptop family to the DMI whitelist
+
+commit 410d44c74cf9942e3055d5b7d73953fac8efbacb upstream.
+
+This is to support Precision M4500 and others.
+
+Signed-off-by: Rezwanul Kabir <Rezwanul_Kabir at dell.com>
+Signed-off-by: Matthew Garrett <mjg at redhat.com>
+---
+ drivers/platform/x86/dell-laptop.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
+index 661e3ac..9238218 100644
+--- a/drivers/platform/x86/dell-laptop.c
++++ b/drivers/platform/x86/dell-laptop.c
+@@ -83,6 +83,12 @@ static const struct dmi_system_id __initdata dell_device_table[] = {
+ 		},
+ 	},
+ 	{
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++			DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/
++		},
++	},
++	{
+ 		.ident = "Dell Computer Corporation",
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+@@ -621,4 +627,5 @@ MODULE_AUTHOR("Matthew Garrett <mjg at redhat.com>");
+ MODULE_DESCRIPTION("Dell laptop driver");
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*");
++MODULE_ALIAS("dmi:*svnDellInc.:*:ct9:*");
+ MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*");
+-- 
+1.7.2.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Sun Jan  2 23:08:35 2011	(r16750)
+++ dists/sid/linux-2.6/debian/patches/series/30	Sun Jan  2 23:27:09 2011	(r16751)
@@ -24,3 +24,5 @@
 + bugfix/all/exec-copy-and-paste-the-fixes-into-compat_do_execve-paths.patch
 + features/all/rt28x0-Add-ieee80211_regdom-module-parameter.patch
 + bugfix/all/btrfs-Require-CAP_SYS_ADMIN-for-filesystem-rebalance.patch
++ features/x86/dell-laptop-Add-Dell-Computer-type-8-to-DMI-whitelist.patch
++ features/x86/dell-laptop-Add-Dell-Inc-type-9-to-DMI-whitelist.patch