Revision: 123
http://svn.sourceforge.net/mactel-linux/?rev=123&view=rev
Author: nboichat
Date: 2007-05-03 20:42:01 -0700 (Thu, 03 May 2007)
Log Message:
-----------
Add 2 minor patches (one to fix applesmc filenames, the other to fix the
comment for the kernel option about fn keys)
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.21/applesmc_int.patch
trunk/kernel/mactel-patches-2.6.21/series
Added Paths:
-----------
trunk/kernel/mactel-patches-2.6.21/applesmc-fix-names.patch
trunk/kernel/mactel-patches-2.6.21/fix_usb_hidinput_powerbook_comment.patch
Added: trunk/kernel/mactel-patches-2.6.21/applesmc-fix-names.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/applesmc-fix-names.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.21/applesmc-fix-names.patch 2007-05-04
03:42:01 UTC (rev 123)
@@ -0,0 +1,89 @@
+Subject: Apple SMC driver: fix temperature attribute file names.
+
+From: Jean Delvare <[EMAIL PROTECTED]>
+
+These attribute names don't follow the standard, there's an extra "_"
+which shouldn't be there.
+
+Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
+Cc: Nicolas Boichat <[EMAIL PROTECTED]>
+Cc: Dmitry Torokhov <[EMAIL PROTECTED]>
+Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
+---
+
+ drivers/hwmon/applesmc.c | 48 +++++++++++++++++++++++-----------------------
+ 1 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
+index ea0a004..4e8da39 100644
+--- a/drivers/hwmon/applesmc.c
++++ b/drivers/hwmon/applesmc.c
+@@ -1011,44 +1011,44 @@ static const struct attribute_group
fan_attribute_groups[] = {
+ /*
+ * Temperature sensors sysfs entries.
+ */
+-static SENSOR_DEVICE_ATTR(temp_1_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 0);
+-static SENSOR_DEVICE_ATTR(temp_2_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 1);
+-static SENSOR_DEVICE_ATTR(temp_3_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 2);
+-static SENSOR_DEVICE_ATTR(temp_4_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 3);
+-static SENSOR_DEVICE_ATTR(temp_5_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp5_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 4);
+-static SENSOR_DEVICE_ATTR(temp_6_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp6_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 5);
+-static SENSOR_DEVICE_ATTR(temp_7_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp7_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 6);
+-static SENSOR_DEVICE_ATTR(temp_8_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp8_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 7);
+-static SENSOR_DEVICE_ATTR(temp_9_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp9_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 8);
+-static SENSOR_DEVICE_ATTR(temp_10_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp10_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 9);
+-static SENSOR_DEVICE_ATTR(temp_11_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp11_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 10);
+-static SENSOR_DEVICE_ATTR(temp_12_input, S_IRUGO,
++static SENSOR_DEVICE_ATTR(temp12_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 11);
+
+ static struct attribute *temperature_attributes[] = {
+- &sensor_dev_attr_temp_1_input.dev_attr.attr,
+- &sensor_dev_attr_temp_2_input.dev_attr.attr,
+- &sensor_dev_attr_temp_3_input.dev_attr.attr,
+- &sensor_dev_attr_temp_4_input.dev_attr.attr,
+- &sensor_dev_attr_temp_5_input.dev_attr.attr,
+- &sensor_dev_attr_temp_6_input.dev_attr.attr,
+- &sensor_dev_attr_temp_7_input.dev_attr.attr,
+- &sensor_dev_attr_temp_8_input.dev_attr.attr,
+- &sensor_dev_attr_temp_9_input.dev_attr.attr,
+- &sensor_dev_attr_temp_10_input.dev_attr.attr,
+- &sensor_dev_attr_temp_11_input.dev_attr.attr,
+- &sensor_dev_attr_temp_12_input.dev_attr.attr,
++ &sensor_dev_attr_temp1_input.dev_attr.attr,
++ &sensor_dev_attr_temp2_input.dev_attr.attr,
++ &sensor_dev_attr_temp3_input.dev_attr.attr,
++ &sensor_dev_attr_temp4_input.dev_attr.attr,
++ &sensor_dev_attr_temp5_input.dev_attr.attr,
++ &sensor_dev_attr_temp6_input.dev_attr.attr,
++ &sensor_dev_attr_temp7_input.dev_attr.attr,
++ &sensor_dev_attr_temp8_input.dev_attr.attr,
++ &sensor_dev_attr_temp9_input.dev_attr.attr,
++ &sensor_dev_attr_temp10_input.dev_attr.attr,
++ &sensor_dev_attr_temp11_input.dev_attr.attr,
++ &sensor_dev_attr_temp12_input.dev_attr.attr,
+ NULL
+ };
+
Modified: trunk/kernel/mactel-patches-2.6.21/applesmc_int.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/applesmc_int.patch 2007-05-04
03:16:41 UTC (rev 122)
+++ trunk/kernel/mactel-patches-2.6.21/applesmc_int.patch 2007-05-04
03:42:01 UTC (rev 123)
@@ -9,7 +9,7 @@
1 files changed, 293 insertions(+), 23 deletions(-)
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
-index ea0a004..087d101 100644
+index 4e8da39..e9a3a11 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -39,14 +39,20 @@
Added:
trunk/kernel/mactel-patches-2.6.21/fix_usb_hidinput_powerbook_comment.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/fix_usb_hidinput_powerbook_comment.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.21/fix_usb_hidinput_powerbook_comment.patch
2007-05-04 03:42:01 UTC (rev 123)
@@ -0,0 +1,29 @@
+Fix USB_HIDINPUT_POWERBOOK comment in Kconfig.
+
+From: Nicolas Boichat <[EMAIL PROTECTED]>
+
+
+---
+
+ drivers/usb/input/Kconfig | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
+index f88c132..422e26f 100644
+--- a/drivers/usb/input/Kconfig
++++ b/drivers/usb/input/Kconfig
+@@ -28,12 +28,12 @@ comment "Input core support is needed for USB HID input
layer or HIDBP support"
+ depends on USB_HID && INPUT=n
+
+ config USB_HIDINPUT_POWERBOOK
+- bool "Enable support for iBook/PowerBook special keys"
++ bool "Enable support for Macintosh special keys"
+ default n
+ depends on USB_HID
+ help
+ Say Y here if you want support for the special keys (Fn, Numlock) on
+- Apple iBooks and PowerBooks.
++ Apple computers (iBooks, PowerBooks, Macbooks).
+
+ If unsure, say N.
+
Modified: trunk/kernel/mactel-patches-2.6.21/series
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/series 2007-05-04 03:16:41 UTC (rev
122)
+++ trunk/kernel/mactel-patches-2.6.21/series 2007-05-04 03:42:01 UTC (rev
123)
@@ -11,4 +11,6 @@
applesmc_standard.patch
applesmc_enum.patch
applesmc_fix_sleep_in_led_brightness_set.patch
+applesmc-fix-names.patch
applesmc_int.patch
+fix_usb_hidinput_powerbook_comment.patch
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Mactel-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mactel-linux-devel
