more cleanup

svn path=/; revision=187

10 files changed, 0 insertions, 930 deletions

diff --git a/sys-kernel/mactel-linux-sources/Manifest b/sys-kernel/mactel-linux-sources/Manifest
index 75161d1..a72d2e0 100644
--- a/sys-kernel/mactel-linux-sources/Manifest
+++ b/sys-kernel/mactel-linux-sources/Manifest
@@ -4,14 +4,6 @@ AUX 2.6.24-mactel-patches-r145/applesmc_int.patch 11196 RMD160 732ddf93bdbb07e23
 AUX 2.6.24-mactel-patches-r145/appletouch.patch 653 RMD160 7af72520cfc712a37ad3a44e2d7ffa66284cdd77 SHA1 0a2ae7c4d9057322be7bfe269c1724bbdcb1c6e6 SHA256 4ed7833238e497050fc175e2f41777e983a58ba61b6ed6034df307065e57cf8e
 AUX 2.6.24-mactel-patches-r145/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch 819 RMD160 8bec3f90f028e060695aebf0f8bae63778cd013c SHA1 19142c8fd86614727b95a0374539315995768e25 SHA256 94e7415487d455cbd1d0f6a3d5a393b4d008ac6dedf1a335a2aa40b70d6767f2
 AUX 2.6.24-mactel-patches-r145/sigmatel_audio_fix_macbook_v2.patch 855 RMD160 f9a8a9c67f2a69e9e6cd5012c4a58e493d05930b SHA1 677656bd94f432aa92ad77b13c8fe32fd738a71b SHA256 4ad9524f09b2d3ffc2d3643be844a25e5ad11e7e7b4638e98340d10d27c5a722
-AUX 2.6.24-mactel-patches-r148/applesmc-case-led.patch 4329 RMD160 c983bf2caa205dc6cbebef97a29bcb83199fbd0b SHA1 001c03b338ca7a447fd05a4a610601d0d6698712 SHA256 3fe745f196839162578becd9a8fb6aaf9e6836244fb2cd5e0e9d798c46d852c2
-AUX 2.6.24-mactel-patches-r148/applesmc-macbook2.patch 3087 RMD160 b5ab439fcdfb24f08cc78177508d1cad1c78c4e5 SHA1 c3ccdbab39fe322398509e192710a84573b31314 SHA256 8f4b003eedcc819776ed7c15e5c67e94fb28799c3bc8f89261d4b582367fa257
-AUX 2.6.24-mactel-patches-r148/applesmc-retry-when-accessing-keys.patch 3004 RMD160 3ab72946c44269350b51f7ae6b03d031534a9c3f SHA1 1301ba8be6cadd20551cebb488c4aea020b89050 SHA256 0d0a6ddc98b9b923c43cfb3a03fa6f43b8f1fbeec326b6cc6622f6c6b7660016
-AUX 2.6.24-mactel-patches-r148/applesmc_int.patch 11184 RMD160 da9f79021d8b46ed6c4ea3c49a1b3b914aa09ae5 SHA1 60a59a323c0a14f58286f4db550e4bfd85a5139b SHA256 fb6b6fd8c663e6480a65891cacc904fcc5ed0d17a9b7c3a8d70071dfa5513adf
-AUX 2.6.24-mactel-patches-r148/appletouch-add-macbook3-trackpad.patch 1553 RMD160 73c1d944cb9dbc2cfb36034927082dd18dc34fe7 SHA1 64a40fbd2fbbe64aca25354e5430d7323bcad3d0 SHA256 5d8df65b0b452592aacd5d28baa3197ced474cfd699a5e140277c4f2527fc2da
-AUX 2.6.24-mactel-patches-r148/appletouch.patch 653 RMD160 7af72520cfc712a37ad3a44e2d7ffa66284cdd77 SHA1 0a2ae7c4d9057322be7bfe269c1724bbdcb1c6e6 SHA256 4ed7833238e497050fc175e2f41777e983a58ba61b6ed6034df307065e57cf8e
-AUX 2.6.24-mactel-patches-r148/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch 819 RMD160 8bec3f90f028e060695aebf0f8bae63778cd013c SHA1 19142c8fd86614727b95a0374539315995768e25 SHA256 94e7415487d455cbd1d0f6a3d5a393b4d008ac6dedf1a335a2aa40b70d6767f2
-AUX 2.6.24-mactel-patches-r148/sigmatel_audio_fix_macbook_v2.patch 855 RMD160 f9a8a9c67f2a69e9e6cd5012c4a58e493d05930b SHA1 677656bd94f432aa92ad77b13c8fe32fd738a71b SHA256 4ad9524f09b2d3ffc2d3643be844a25e5ad11e7e7b4638e98340d10d27c5a722
 AUX 2.6.24-mactel-patches-r149/applesmc-case-led.patch 4329 RMD160 c983bf2caa205dc6cbebef97a29bcb83199fbd0b SHA1 001c03b338ca7a447fd05a4a610601d0d6698712 SHA256 3fe745f196839162578becd9a8fb6aaf9e6836244fb2cd5e0e9d798c46d852c2
 AUX 2.6.24-mactel-patches-r149/applesmc-macbook2.patch 3087 RMD160 cc8004b2cded1ab1e799f80892e9c0ead247f1ac SHA1 9ebdbe5427a962fc8fd1293f2ec5c6b0bf9472c2 SHA256 7e77a025094f33329d72b3173a59d7b45046e6e244b8f7fa86ac397fa6455eff
 AUX 2.6.24-mactel-patches-r149/applesmc-retry-when-accessing-keys.patch 3004 RMD160 424e9ddee6928a97eea55dbbbc8dec0ab5538b9b SHA1 262db3755ab837468aea2f7c89c755c5e597ac09 SHA256 82bf776bb5029f5a9a292c5a42109fa22f3ce5540122af5faad4ad273592c3c9
@@ -47,8 +39,6 @@ AUX mactel-patches-r147/sigmatel_audio_display_all_controls_when_subsystem_id_is
 AUX mactel-patches-r147/sigmatel_audio_fix_macbook_v2.patch 855 RMD160 8135541c8f9c988d78f4892c81b503d703a26b97 SHA1 1b39cf5e36063cb9043ccae8e01709366fb25102 SHA256 08362cac191683e4d615e5f1220c976cf62bc2cf0d2850ee23c5c14d75638ac6
 DIST genpatches-2.6.23-5.base.tar.bz2 82324 RMD160 b49a59910d95bd12f077a5de51961cbb5799895e SHA1 edff5b23fb3c9949a76f5c58d95c1542f72d757b SHA256 d778784f81b1bfd342e0b94cbe2fc5324c102024c025e3152cf06c1e86787041
 DIST genpatches-2.6.23-5.extras.tar.bz2 147992 RMD160 bb9cfc7687944b677799b2386bc4b36d95676cea SHA1 fc7f24df398033cdf8e0ff444020c58407aa9925 SHA256 9d272384be06e00ecfdfa1795262a0859e86acd09aa95c531ff311e210d87db6
-DIST genpatches-2.6.24-1.base.tar.bz2 960 RMD160 a7b9932bc33e8a56da4bfafbdf16749bf141db6c SHA1 19271490c3faf040b7cf580123690785e95c1c66 SHA256 3f7c948b72494aed970be1187a75c7c8573ad500e35c5bc9610b87ffa42bd54f
-DIST genpatches-2.6.24-1.extras.tar.bz2 41902 RMD160 259b831110120518149bbccdacf9982330af5ef0 SHA1 48d85d6b6cf84369b34d6fbd169fbfdaf97fc83f SHA256 bc8723863cace59d8bcb6d84d678cc9c370a5e2144133f543396b45e4655b063
 DIST genpatches-2.6.24-2.base.tar.bz2 22171 RMD160 59509ac6af64a2ef1d0be8c9409f3144c75e93d8 SHA1 84e6c497508b663ae5f32f352c1299a1bf09691a SHA256 1c002fd593f623516c93e2bae65f77eaa84e8e410f9def268c9c091b09c29e3f
 DIST genpatches-2.6.24-2.extras.tar.bz2 43587 RMD160 a41366bb7372c168d4ede2de420256e25560122c SHA1 3a048660019206344a065beaa8dbaadbfa0a7f3b SHA256 8cee70233f609bd01c1645e9cb90c4637ee6f989b4583d652ea2df57a8894296
 DIST genpatches-2.6.24-3.base.tar.bz2 22714 RMD160 826ab844e3f4d96f94e09d8763a0131d01bdce94 SHA1 1c50a62af1265684b8039d936a4fb044b3eb72b8 SHA256 51e9a3b0ca3f7434b9b0e91072509e7f697998efbfc869b6528daa7811bc2bb3
@@ -61,4 +51,3 @@ EBUILD mactel-linux-sources-2.6.23-r4.ebuild 1399 RMD160 8e498711091da40a9043349
 EBUILD mactel-linux-sources-2.6.24-r1.ebuild 1151 RMD160 6ef9ab524a56008e0536378cfa3e112fc835dc45 SHA1 c18c164d49f76106c15110b44d83ab4311cc45c7 SHA256 b7520cdb8c33451468f85fbe8d7af1cdf47ca10a815e740cd53bedbc9f1a9b17
 EBUILD mactel-linux-sources-2.6.24-r2.ebuild 1151 RMD160 3062875a537f2bc7b2f70eabbc3b92fdf18c1efe SHA1 8402bc13eecff1b22d86204971e5fae1fc5161aa SHA256 f8a459ee7d302c6ab1dff77ad2f632cbec43655ed02854548f55cef3fbfa5293
 EBUILD mactel-linux-sources-2.6.24-r3.ebuild 1196 RMD160 f5e02f5dc00c27d1af90a7fda0c259f5f79b6b3a SHA1 0b90bd716953e5fad55ac6ea05265a9db162191c SHA256 62933738e49924e7b33d0af3bcec6d43671bb82df2d9bf745f7014bad832a82f
-EBUILD mactel-linux-sources-2.6.24.ebuild 1154 RMD160 ec564451d8faa0e069d228235b06a7715e40102b SHA1 691dc3f2e57b35f93e8b2bb3cfb7e73471355679 SHA256 8e018f64052e469682fc4a03d0465a79fc218ca4263231560f5a4f950777d0d7
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-case-led.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-case-led.patch
deleted file mode 100644
index 860f9d4..0000000
--- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-case-led.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-[PATCH] applesmc case led and SCSI LED activity trigger
-
-From: René Rebe <rene@exactcode.de>
-
-
----
-
- drivers/hwmon/applesmc.c |   70 ++++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 61 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
-index 86c66c3..377c96d 100644
---- a/drivers/hwmon/applesmc.c
-+++ b/drivers/hwmon/applesmc.c
-@@ -63,6 +63,8 @@
- 
- #define CLAMSHELL_KEY		"MSLD" /* r-o ui8 (unused) */
- 
-+#define LED_KEY			"LSLF" /* r-w ui16 */
-+
- #define MOTION_SENSOR_X_KEY	"MO_X" /* r-o sp78 (2 bytes) */
- #define MOTION_SENSOR_Y_KEY	"MO_Y" /* r-o sp78 (2 bytes) */
- #define MOTION_SENSOR_Z_KEY	"MO_Z" /* r-o sp78 (2 bytes) */
-@@ -151,7 +153,7 @@ static DEFINE_MUTEX(applesmc_lock);
-  */
- static unsigned int key_at_index;
- 
--static struct workqueue_struct *applesmc_led_wq;
-+static struct workqueue_struct *applesmc_led_wq, *applesmc_backlight_wq;
- 
- /*
-  * __wait_status - Wait up to 2ms for the status port to get a certain value
-@@ -742,13 +744,40 @@ static void applesmc_backlight_set(struct work_struct *work)
- }
- static DECLARE_WORK(backlight_work, &applesmc_backlight_set);
- 
--static void applesmc_brightness_set(struct led_classdev *led_cdev,
--						enum led_brightness value)
-+static void applesmc_backlight_brightness_set(struct led_classdev *led_cdev,
-+					      enum led_brightness value)
- {
- 	int ret;
- 
- 	backlight_value = value;
--	ret = queue_work(applesmc_led_wq, &backlight_work);
-+	ret = queue_work(applesmc_backlight_wq, &backlight_work);
-+
-+	if (debug && (!ret))
-+		printk(KERN_DEBUG "applesmc: work was already on the queue.\n");
-+}
-+
-+/* Store the next LED value to be written by the work */
-+static unsigned int led_value;
-+
-+static void applesmc_led_set(struct work_struct *work)
-+{
-+	u8 buffer[2];
-+
-+	mutex_lock(&applesmc_lock);
-+	buffer[0] = led_value;
-+	buffer[1] = 0x00;
-+	applesmc_write_key(LED_KEY, buffer, 2);
-+	mutex_unlock(&applesmc_lock);
-+}
-+static DECLARE_WORK(led_work, &applesmc_led_set);
-+
-+static void applesmc_led_brightness_set(struct led_classdev *led_cdev,
-+					 enum led_brightness value)
-+{
-+	int ret;
-+
-+	led_value = value;
-+	ret = queue_work(applesmc_led_wq, &led_work);
- 
- 	if (debug && (!ret))
- 		printk(KERN_DEBUG "applesmc: work was already on the queue.\n");
-@@ -904,10 +933,16 @@ static ssize_t applesmc_key_at_index_store(struct device *dev,
- 	return count;
- }
- 
-+static struct led_classdev applesmc_led = {
-+	.name			= "smc:case-led",
-+	.default_trigger	= "ide-disk",
-+	.brightness_set		= applesmc_led_brightness_set,
-+};
-+
- static struct led_classdev applesmc_backlight = {
- 	.name			= "smc:kbd_backlight",
- 	.default_trigger	= "nand-disk",
--	.brightness_set		= applesmc_brightness_set,
-+	.brightness_set		= applesmc_backlight_brightness_set,
- };
- 
- static DEVICE_ATTR(name, 0444, applesmc_name_show, NULL);
-@@ -1340,15 +1375,28 @@ static int __init applesmc_init(void)
- 			goto out_temperature;
- 	}
- 
-+        /* Create the workqueue */
-+        applesmc_led_wq = create_singlethread_workqueue("applesmc-led");
-+        if (!applesmc_led_wq) {
-+                ret = -ENOMEM;
-+                goto out_accelerometer;
-+        }
-+
-+        /* register as a led device */
-+        ret = led_classdev_register(&pdev->dev, &applesmc_led);
-+        if (ret < 0)
-+                goto out_led_wq;
-+
-+
- 	if (applesmc_light) {
- 		/* Add light sensor file */
- 		ret = sysfs_create_file(&pdev->dev.kobj, &dev_attr_light.attr);
- 		if (ret)
--			goto out_accelerometer;
-+			goto out_led_ledclass;
- 
- 		/* Create the workqueue */
--		applesmc_led_wq = create_singlethread_workqueue("applesmc-led");
--		if (!applesmc_led_wq) {
-+		applesmc_backlight_wq = create_singlethread_workqueue("applesmc-backlight");
-+		if (!applesmc_backlight_wq) {
- 			ret = -ENOMEM;
- 			goto out_light_sysfs;
- 		}
-@@ -1374,10 +1422,14 @@ out_light_ledclass:
- 		led_classdev_unregister(&applesmc_backlight);
- out_light_wq:
- 	if (applesmc_light)
--		destroy_workqueue(applesmc_led_wq);
-+		destroy_workqueue(applesmc_backlight_wq);
- out_light_sysfs:
- 	if (applesmc_light)
- 		sysfs_remove_file(&pdev->dev.kobj, &dev_attr_light.attr);
-+out_led_ledclass:
-+        led_classdev_unregister(&applesmc_led);
-+out_led_wq:
-+        destroy_workqueue(applesmc_led_wq);
- out_accelerometer:
- 	if (applesmc_accelerometer)
- 		applesmc_release_accelerometer();
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-macbook2.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-macbook2.patch
deleted file mode 100644
index 8f7e84e..0000000
--- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-macbook2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Add sensors set for MacBook2, from register dump on a mid-2007 MacBook2.
-
-From: Riki Oktarianto <rkoktarianto@gmail.com>
-
-
----
-
- drivers/hwmon/applesmc.c |   29 +++++++++++++++++++----------
- 1 files changed, 19 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
-index 377c96d..4dca4cd 100644
---- a/drivers/hwmon/applesmc.c
-+++ b/drivers/hwmon/applesmc.c
-@@ -86,12 +86,15 @@ static const char* temperature_sensors_sets[][36] = {
- /* Set 0: Macbook Pro */
- 	{ "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
- 	  "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
--/* Set 1: Macbook set */
-+/* Set 1: Macbook2 set */
-+	{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "TTF0", "Th0H",
-+	  "Th0S", "Th1H", NULL },
-+/* Set 2: Macbook set */
- 	{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S",
- 	  "Th1H", "Ts0P", NULL },
--/* Set 2: Macmini set */
-+/* Set 3: Macmini set */
- 	{ "TC0D", "TC0P", NULL },
--/* Set 3: Mac Pro (2 x Quad-Core) */
-+/* Set 4: Mac Pro (2 x Quad-Core) */
- 	{ "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", "TC0C", "TC0D", "TC0P",
- 	  "TC1C", "TC1D", "TC2C", "TC2D", "TC3C", "TC3D", "THTG", "TH0P",
- 	  "TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S",
-@@ -1247,12 +1250,14 @@ static void applesmc_release_accelerometer(void)
- static __initdata struct dmi_match_data applesmc_dmi_data[] = {
- /* MacBook Pro: accelerometer, backlight and temperature set 0 */
- 	{ .accelerometer = 1, .light = 1, .temperature_set = 0 },
--/* MacBook: accelerometer and temperature set 1 */
-+/* MacBook2: accelerometer and temperature set 1 */
- 	{ .accelerometer = 1, .light = 0, .temperature_set = 1 },
--/* MacMini: temperature set 2 */
--	{ .accelerometer = 0, .light = 0, .temperature_set = 2 },
--/* MacPro: temperature set 3 */
-+/* MacBook: accelerometer and temperature set 2 */
-+	{ .accelerometer = 1, .light = 0, .temperature_set = 2 },
-+/* MacMini: temperature set 3 */
- 	{ .accelerometer = 0, .light = 0, .temperature_set = 3 },
-+/* MacPro: temperature set 4 */
-+	{ .accelerometer = 0, .light = 0, .temperature_set = 4 },
- };
- 
- /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
-@@ -1264,16 +1269,20 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
- 		(void*)&applesmc_dmi_data[0]},
- 	{ applesmc_dmi_match, "Apple MacBook", {
- 	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
--	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
-+	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") },
- 		(void*)&applesmc_dmi_data[1]},
-+	{ applesmc_dmi_match, "Apple MacBook", {
-+	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
-+	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
-+		(void*)&applesmc_dmi_data[2]},
- 	{ applesmc_dmi_match, "Apple Macmini", {
- 	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
- 	  DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") },
--		(void*)&applesmc_dmi_data[2]},
-+		(void*)&applesmc_dmi_data[3]},
- 	{ applesmc_dmi_match, "Apple MacPro2", {
- 	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
- 	  DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
--		(void*)&applesmc_dmi_data[3]},
-+		(void*)&applesmc_dmi_data[4]},
- 	{ .ident = NULL }
- };
- 
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-retry-when-accessing-keys.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-retry-when-accessing-keys.patch
deleted file mode 100644
index ad72674..0000000
--- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-retry-when-accessing-keys.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Retry up to 200 ms when reading or writing keys.
-
-From: Nicolas Boichat <nicolas@boichat.ch>
-
-
----
-
- drivers/hwmon/applesmc.c |   69 +++++++++++++++++++++++++++++++---------------
- 1 files changed, 47 insertions(+), 22 deletions(-)
-
-diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
-index 4dca4cd..0950839 100644
---- a/drivers/hwmon/applesmc.c
-+++ b/drivers/hwmon/applesmc.c
-@@ -114,6 +114,9 @@ static const char* fan_speed_keys[] = {
- #define INIT_TIMEOUT_MSECS	5000	/* wait up to 5s for device init ... */
- #define INIT_WAIT_MSECS		50	/* ... in 50ms increments */
- 
-+#define ACCESS_TIMEOUT_MSECS	500	/* wait up to 500ms when accessing a key */
-+#define ACCESS_WAIT_MSECS	5	/* ... in 5ms increments */
-+
- #define APPLESMC_POLL_INTERVAL	50	/* msecs */
- #define APPLESMC_INPUT_FUZZ	4	/* input event threshold */
- #define APPLESMC_INPUT_FLAT	4
-@@ -188,12 +191,13 @@ static int __wait_status(u8 val)
- 
- /*
-  * applesmc_read_key - reads len bytes from a given key, and put them in buffer.
-+ * Tries up to ACCESS_WAIT_MSECS to read the value.
-  * Returns zero on success or a negative error on failure. Callers must
-  * hold applesmc_lock.
-  */
- static int applesmc_read_key(const char* key, u8* buffer, u8 len)
- {
--	int i;
-+	int i, total, ret;
- 
- 	if (len > APPLESMC_MAX_DATA_LENGTH) {
- 		printk(KERN_ERR	"applesmc_read_key: cannot read more than "
-@@ -201,33 +205,54 @@ static int applesmc_read_key(const char* key, u8* buffer, u8 len)
- 		return -EINVAL;
- 	}
- 
--	outb(APPLESMC_READ_CMD, APPLESMC_CMD_PORT);
--	if (__wait_status(0x0c))
--		return -EIO;
-+	for (total = ACCESS_TIMEOUT_MSECS; total > 0;
-+						total -= ACCESS_WAIT_MSECS) {
-+		ret = 0;
-+		outb(APPLESMC_READ_CMD, APPLESMC_CMD_PORT);
-+		if (__wait_status(0x0c)) {
-+			ret = -EIO;
-+			goto wait_fail;
-+		}
- 
--	for (i = 0; i < 4; i++) {
--		outb(key[i], APPLESMC_DATA_PORT);
--		if (__wait_status(0x04))
--			return -EIO;
--	}
--	if (debug)
--		printk(KERN_DEBUG "<%s", key);
-+		for (i = 0; i < 4; i++) {
-+			outb(key[i], APPLESMC_DATA_PORT);
-+			if (__wait_status(0x04)) {
-+				ret = -EIO;
-+				goto wait_fail;
-+			}
-+		}
-+		if (debug)
-+			printk(KERN_DEBUG "<%s", key);
- 
--	outb(len, APPLESMC_DATA_PORT);
--	if (debug)
--		printk(KERN_DEBUG ">%x", len);
-+		outb(len, APPLESMC_DATA_PORT);
-+		if (debug)
-+			printk(KERN_DEBUG ">%x", len);
- 
--	for (i = 0; i < len; i++) {
--		if (__wait_status(0x05))
--			return -EIO;
--		buffer[i] = inb(APPLESMC_DATA_PORT);
-+		for (i = 0; i < len; i++) {
-+			if (__wait_status(0x05)) {
-+				ret = -EIO;
-+				goto wait_fail;
-+			}
-+			buffer[i] = inb(APPLESMC_DATA_PORT);
-+			if (debug)
-+				printk(KERN_DEBUG "<%x", buffer[i]);
-+		}
- 		if (debug)
--			printk(KERN_DEBUG "<%x", buffer[i]);
-+			printk(KERN_DEBUG "\n");
-+
-+		break;
-+
-+wait_fail:
-+		msleep(ACCESS_WAIT_MSECS);
-+		continue;		
- 	}
--	if (debug)
--		printk(KERN_DEBUG "\n");
- 
--	return 0;
-+	if (total != ACCESS_TIMEOUT_MSECS) {
-+		printk(KERN_DEBUG "Read: Waited %d ms for the value\n",
-+						ACCESS_TIMEOUT_MSECS-total);
-+	}
-+
-+	return ret;
- }
- 
- /*
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc_int.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc_int.patch
deleted file mode 100644
index a0904f8..0000000
--- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc_int.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-Add interrupt support for the accelerometer. A message is printed in dmesg when an interrupt occurs, but no further handling is done.
-
-From: Nicolas Boichat <nicolas@boichat.ch>
-
-
----
-
- drivers/hwmon/applesmc.c |  321 +++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 298 insertions(+), 23 deletions(-)
-
-diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
-index 0950839..fe07ebd 100644
---- a/drivers/hwmon/applesmc.c
-+++ b/drivers/hwmon/applesmc.c
-@@ -39,14 +39,20 @@
- #include <linux/leds.h>
- #include <linux/hwmon.h>
- #include <linux/workqueue.h>
-+#include <linux/interrupt.h>
- 
- /* data port used by Apple SMC */
- #define APPLESMC_DATA_PORT	0x300
- /* command/status port used by Apple SMC */
- #define APPLESMC_CMD_PORT	0x304
-+/* status port used by Apple SMC to get which interrupt type just happened */
-+#define APPLESMC_INT_PORT	0x31f
- 
- #define APPLESMC_NR_PORTS	32 /* 0x300-0x31f */
- 
-+/* Defined in ACPI DSDT table, should we read it from there? */
-+#define APPLESMC_IRQ		6
-+
- #define APPLESMC_MAX_DATA_LENGTH 32
- 
- #define APPLESMC_STATUS_MASK	0x0f
-@@ -57,6 +63,8 @@
- 
- #define KEY_COUNT_KEY		"#KEY" /* r-o ui32 */
- 
-+#define INTERRUPT_OK_KEY	"NTOK" /* w-o ui8 */
-+
- #define LIGHT_SENSOR_LEFT_KEY	"ALV0" /* r-o {alv (6 bytes) */
- #define LIGHT_SENSOR_RIGHT_KEY	"ALV1" /* r-o {alv (6 bytes) */
- #define BACKLIGHT_KEY		"LKSB" /* w-o {lkb (2 bytes) */
-@@ -70,6 +78,19 @@
- #define MOTION_SENSOR_Z_KEY	"MO_Z" /* r-o sp78 (2 bytes) */
- #define MOTION_SENSOR_KEY	"MOCN" /* r/w ui16 */
- 
-+/*
-+ * Interrupt controls.
-+ * If the norm of the position (sqrt(MO_X^2+MO_Y^2+MO_Z^2)) is smaller than
-+ * MOLT (free fall), or bigger than MOHT (high acceleration) for longer than the
-+ * value of MOLD (or MOHD), SMC will trigger an interrupt.
-+ */
-+#define MOTION_LOW_NORM			"MOLT" /* r/w sp78 (2 bytes) */
-+#define MOTION_HIGH_NORM		"MOHT" /* r/w sp78 (2 bytes) */
-+#define MOTION_LOW_NORM_INTERVAL	"MOLD" /* r/w ui8 */
-+#define MOTION_HIGH_NORM_INTERVAL	"MOHD" /* r/w ui8 */
-+
-+#define MSDW_KEY		"MSDW" /* r/w flag (1 byte) */
-+
- #define FANS_COUNT		"FNum" /* r-o ui8 */
- #define FANS_MANUAL		"FS! " /* r-w ui16 */
- #define FAN_ACTUAL_SPEED	"F0Ac" /* r-o fpe2 (2 bytes) */
-@@ -387,12 +408,83 @@ static int applesmc_read_motion_sensor(int index, s16* value)
- }
- 
- /*
-+ * applesmc_init_check_key_value - checks if a given key contains the bytes in
-+ * buffer, if not, writes these bytes.
-+ * In case of failure retry every INIT_WAIT_MSECS msec, and timeout if it
-+ * waited more than INIT_TIMEOUT_MSECS in total.
-+ * Returns zero on success or a negative error on failure. Callers must
-+ * hold applesmc_lock.
-+ */
-+static int applesmc_init_check_key_value(const char *key, u8 *buffer, u8 len)
-+{
-+	int total, ret, i, compare;
-+	u8 rdbuffer[APPLESMC_MAX_DATA_LENGTH];
-+
-+	if (len > APPLESMC_MAX_DATA_LENGTH) {
-+		printk(KERN_ERR "applesmc_init_check_key_value: cannot "
-+					"read/write more than %d bytes",
-+					APPLESMC_MAX_DATA_LENGTH);
-+		return -EINVAL;
-+	}
-+
-+	for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) {
-+		ret = applesmc_read_key(key, rdbuffer, len);
-+		if (!ret) {
-+			compare = 1;
-+			for (i = 0; i < len; i++) {
-+				if (rdbuffer[i] != buffer[i]) {
-+					compare = 0;
-+					break;
-+				}
-+			}
-+
-+			if (compare) {
-+				return 0;
-+			}
-+		}
-+		ret = applesmc_write_key(key, buffer, len);
-+		msleep(INIT_WAIT_MSECS);
-+	}
-+
-+	if (ret)
-+		return ret;
-+	else
-+		return -EIO;
-+}
-+
-+irqreturn_t applesmc_irq_handler(int irq, void *dev_id)
-+{
-+	u8 int_type = inb(APPLESMC_INT_PORT);
-+
-+	switch (int_type) {
-+	case 0x60:
-+		printk(KERN_INFO "applesmc: received a free fall interrupt\n");
-+		break;
-+	case 0x6f:
-+		printk(KERN_INFO
-+			"applesmc: received a high acceleration interrupt\n");
-+		break;
-+	case 0x80:
-+		printk(KERN_INFO "applesmc: received a shock interrupt\n");
-+		break;
-+	default:
-+		printk(KERN_INFO
-+			"applesmc: received an unknown interrupt %x\n",
-+			int_type);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-  * applesmc_device_init - initialize the accelerometer.  Returns zero on success
-  * and negative error code on failure.  Can sleep.
-  */
- static int applesmc_device_init(void)
- {
--	int total, ret = -ENXIO;
-+	int total;
-+	int ret = -ENXIO;
-+	int ret1, ret2;
- 	u8 buffer[2];
- 
- 	if (!applesmc_accelerometer)
-@@ -400,32 +492,79 @@ static int applesmc_device_init(void)
- 
- 	mutex_lock(&applesmc_lock);
- 
-+	/* Accept interrupts */
-+	buffer[0] = 0x01;
- 	for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) {
--		if (debug)
--			printk(KERN_DEBUG "applesmc try %d\n", total);
--		if (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) &&
--				(buffer[0] != 0x00 || buffer[1] != 0x00)) {
--			if (total == INIT_TIMEOUT_MSECS) {
--				printk(KERN_DEBUG "applesmc: device has"
--						" already been initialized"
--						" (0x%02x, 0x%02x).\n",
--						buffer[0], buffer[1]);
--			} else {
--				printk(KERN_DEBUG "applesmc: device"
--						" successfully initialized"
--						" (0x%02x, 0x%02x).\n",
--						buffer[0], buffer[1]);
--			}
--			ret = 0;
--			goto out;
--		}
--		buffer[0] = 0xe0;
--		buffer[1] = 0x00;
--		applesmc_write_key(MOTION_SENSOR_KEY, buffer, 2);
-+		ret1 = applesmc_write_key(INTERRUPT_OK_KEY, buffer, 1);
- 		msleep(INIT_WAIT_MSECS);
-+
-+		if (!ret1)
-+			break;
-+	}
-+	if (ret1)
-+		printk(KERN_WARNING "applesmc: Cannot set NTOK key, "
-+					"will not receive interrupts.\n");
-+
-+	/* Setup interrupt controls. */
-+	buffer[0] = 20; /* 20 msecs */
-+	ret1 = applesmc_init_check_key_value(MOTION_LOW_NORM_INTERVAL,
-+								buffer, 1);
-+
-+	buffer[0] = 20; /* 20 msecs */
-+	ret2 = applesmc_init_check_key_value(MOTION_HIGH_NORM_INTERVAL,
-+								buffer, 1);
-+
-+	if (ret1 || ret2) {
-+		printk(KERN_WARNING "applesmc: Cannot set motion sensor "
-+					"interrupt interval, might not receive "
-+					"some interrupts.");
- 	}
- 
--	printk(KERN_WARNING "applesmc: failed to init the device\n");
-+	buffer[0] = 0x00;
-+	buffer[1] = 0x60;
-+	ret1 = applesmc_init_check_key_value(MOTION_LOW_NORM, buffer, 2);
-+
-+	buffer[0] = 0x01;
-+	buffer[1] = 0xc0;
-+	ret2 = applesmc_init_check_key_value(MOTION_HIGH_NORM, buffer, 2);
-+
-+	if (ret1 || ret2) {
-+		printk(KERN_WARNING "applesmc: Cannot set motion sensor "
-+				"min/max norm parameters, "
-+				"might not receive some interrupts.");
-+	}
-+
-+	/* Mysterious key. */
-+	buffer[0] = 0x01;
-+	for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) {
-+		ret1 = applesmc_write_key(MSDW_KEY, buffer, 1);
-+		msleep(INIT_WAIT_MSECS);
-+
-+		if (!ret1)
-+			break;
-+	}
-+	if (ret1)
-+		printk(KERN_WARNING "applesmc: Cannot set MSDW key\n");
-+
-+	/* Initialize the device. */
-+	buffer[0] = 0xe0;
-+	buffer[1] = 0xf8;
-+	if (applesmc_init_check_key_value(MOTION_SENSOR_KEY, buffer, 2)) {
-+		printk(KERN_WARNING "applesmc: failed to init "
-+							"the accelerometer\n");
-+		goto out;
-+	}
-+
-+	ret1 = request_irq(APPLESMC_IRQ, applesmc_irq_handler, IRQF_DISABLED,
-+						"applesmc_irq_handler", NULL);
-+
-+	if (ret1) {
-+		printk(KERN_WARNING "applesmc: cannot setup irq handler\n");
-+	}
-+
-+	printk(KERN_DEBUG "applesmc: accelerometer "
-+						"successfully initialized.\n");
-+	ret = 0;
- 
- out:
- 	mutex_unlock(&applesmc_lock);
-@@ -470,9 +609,16 @@ static int applesmc_resume(struct platform_device *dev)
- 	return applesmc_device_init();
- }
- 
-+static int applesmc_remove(struct platform_device *dev)
-+{
-+	free_irq(APPLESMC_IRQ, NULL);
-+	return 0;
-+}
-+
- static struct platform_driver applesmc_driver = {
- 	.probe = applesmc_probe,
- 	.resume = applesmc_resume,
-+	.remove = applesmc_remove,
- 	.driver	= {
- 		.name = "applesmc",
- 		.owner = THIS_MODULE,
-@@ -961,6 +1107,123 @@ static ssize_t applesmc_key_at_index_store(struct device *dev,
- 	return count;
- }
- 
-+static ssize_t applesmc_accelerometer_show(struct device *dev,
-+				struct device_attribute *attr, char *sysfsbuf)
-+{
-+	int ret;
-+	unsigned int value = 0;
-+	u8 buffer[2];
-+	char *key;
-+	int length;
-+	struct sensor_device_attribute_2 *sensor_attr =
-+						to_sensor_dev_attr_2(attr);
-+
-+	switch (sensor_attr->index) {
-+	case 0:
-+		key = MOTION_LOW_NORM_INTERVAL;
-+		length = 1;
-+		break;
-+	case 1:
-+		key = MOTION_HIGH_NORM_INTERVAL;
-+		length = 1;
-+		break;
-+	case 2:
-+		key = MOTION_LOW_NORM;
-+		length = 2;
-+		break;
-+	case 3:
-+		key = MOTION_HIGH_NORM;
-+		length = 2;
-+		break;
-+	default:
-+		printk(KERN_ERR
-+			"Invalid index for applesmc_accelerometer_show");
-+		return -EINVAL;
-+	}
-+
-+	mutex_lock(&applesmc_lock);
-+
-+	ret = applesmc_read_key(key, buffer, length);
-+	if (length == 2)
-+		value = ((unsigned int)buffer[0] << 8) | buffer[1];
-+	else if (length == 1)
-+		value = buffer[0];
-+	else {
-+		printk("Invalid length for applesmc_param_show");
-+		ret = -EINVAL;
-+	}
-+
-+	mutex_unlock(&applesmc_lock);
-+	if (ret)
-+		return ret;
-+	else
-+		return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", value);
-+}
-+
-+static ssize_t applesmc_accelerometer_store(struct device *dev,
-+					struct device_attribute *attr,
-+					const char *sysfsbuf, size_t count)
-+{
-+	int ret;
-+	u32 value;
-+	u8 buffer[2];
-+	char *key;
-+	int length;
-+	struct sensor_device_attribute_2 *sensor_attr =
-+						to_sensor_dev_attr_2(attr);
-+
-+	switch (sensor_attr->index) {
-+	case 0:
-+		key = MOTION_LOW_NORM_INTERVAL;
-+		length = 1;
-+		break;
-+	case 1:
-+		key = MOTION_HIGH_NORM_INTERVAL;
-+		length = 1;
-+		break;
-+	case 2:
-+		key = MOTION_LOW_NORM;
-+		length = 2;
-+		break;
-+	case 3:
-+		key = MOTION_HIGH_NORM;
-+		length = 2;
-+		break;
-+	default:
-+		printk("Invalid index for applesmc_accelerometer_show");
-+		return -EINVAL;
-+	}
-+
-+	value = simple_strtoul(sysfsbuf, NULL, 10);
-+
-+	if (length == 2) {
-+		if (value > 0xffff)
-+			return -EINVAL;
-+
-+		buffer[0] = (value >> 8) & 0xff;
-+		buffer[1] = value & 0xff;
-+	} else if (length == 1) {
-+		if (value > 0xff)
-+			return -EINVAL;
-+
-+		buffer[0] = value & 0xff;
-+	} else {
-+		printk("Invalid length for applesmc_param_store");
-+		return -EINVAL;
-+	}
-+
-+	mutex_lock(&applesmc_lock);
-+
-+	ret = applesmc_write_key(key, buffer, length);
-+
-+	mutex_unlock(&applesmc_lock);
-+
-+	if (ret)
-+		return ret;
-+	else
-+		return count;
-+}
-+
- static struct led_classdev applesmc_led = {
- 	.name			= "smc:case-led",
- 	.default_trigger	= "ide-disk",
-@@ -978,10 +1241,22 @@ static DEVICE_ATTR(name, 0444, applesmc_name_show, NULL);
- static DEVICE_ATTR(position, 0444, applesmc_position_show, NULL);
- static DEVICE_ATTR(calibrate, 0644,
- 			applesmc_calibrate_show, applesmc_calibrate_store);
-+static SENSOR_DEVICE_ATTR(low_norm_trigger_interval, 0644,
-+		applesmc_accelerometer_show, applesmc_accelerometer_store, 0);
-+static SENSOR_DEVICE_ATTR(high_norm_trigger_interval, 0644,
-+		applesmc_accelerometer_show, applesmc_accelerometer_store, 1);
-+static SENSOR_DEVICE_ATTR(low_norm_trigger, 0644,
-+		applesmc_accelerometer_show, applesmc_accelerometer_store, 2);
-+static SENSOR_DEVICE_ATTR(high_norm_trigger, 0644,
-+		applesmc_accelerometer_show, applesmc_accelerometer_store, 3);
- 
- static struct attribute *accelerometer_attributes[] = {
- 	&dev_attr_position.attr,
- 	&dev_attr_calibrate.attr,
-+	&sensor_dev_attr_low_norm_trigger.dev_attr.attr,
-+	&sensor_dev_attr_high_norm_trigger.dev_attr.attr,
-+	&sensor_dev_attr_low_norm_trigger_interval.dev_attr.attr,
-+	&sensor_dev_attr_high_norm_trigger_interval.dev_attr.attr,
- 	NULL
- };
- 
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch-add-macbook3-trackpad.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch-add-macbook3-trackpad.patch
deleted file mode 100644
index feef8da..0000000
--- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch-add-macbook3-trackpad.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Added IDs for macbook3,1 trackpad
-
-From: Chris Irwin <chris@chrisirwin.ca>
-
-
----
-
- drivers/input/mouse/appletouch.c |   15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
-index 17381a9..dcd9a0d 100644
---- a/drivers/input/mouse/appletouch.c
-+++ b/drivers/input/mouse/appletouch.c
-@@ -62,6 +62,11 @@
- #define GEYSER4_ISO_PRODUCT_ID	0x021B
- #define GEYSER4_JIS_PRODUCT_ID	0x021C
- 
-+/* Macbook3,1 devices */
-+#define GEYSER4_HF_ANSI_PRODUCT_ID	0x0229
-+#define GEYSER4_HF_ISO_PRODUCT_ID	0x022A
-+#define GEYSER4_HF_JIS_PRODUCT_ID	0x021B
-+
- #define ATP_DEVICE(prod)					\
- 	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |		\
- 		       USB_DEVICE_ID_MATCH_INT_CLASS |		\
-@@ -93,6 +98,11 @@ static struct usb_device_id atp_table [] = {
- 	{ ATP_DEVICE(GEYSER4_ISO_PRODUCT_ID) },
- 	{ ATP_DEVICE(GEYSER4_JIS_PRODUCT_ID) },
- 
-+	/* Core2 Duo MacBook3,1 */
-+	{ ATP_DEVICE(GEYSER4_HF_ANSI_PRODUCT_ID) },
-+	{ ATP_DEVICE(GEYSER4_HF_ISO_PRODUCT_ID) },
-+	{ ATP_DEVICE(GEYSER4_HF_JIS_PRODUCT_ID) },
-+
- 	/* Terminating entry */
- 	{ }
- };
-@@ -217,7 +227,10 @@ static inline int atp_is_geyser_3(struct atp *dev)
- 		(productId == GEYSER3_JIS_PRODUCT_ID) ||
- 		(productId == GEYSER4_ANSI_PRODUCT_ID) ||
- 		(productId == GEYSER4_ISO_PRODUCT_ID) ||
--		(productId == GEYSER4_JIS_PRODUCT_ID);
-+		(productId == GEYSER4_JIS_PRODUCT_ID) ||
-+		(productId == GEYSER4_HF_ANSI_PRODUCT_ID) ||
-+		(productId == GEYSER4_HF_ISO_PRODUCT_ID) ||
-+		(productId == GEYSER4_HF_JIS_PRODUCT_ID);
- }
- 
- /*
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch.patch
deleted file mode 100644
index d09b12a..0000000
--- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Appletouch driver ATP_THRESHOLD fix.
-
-From: Ortwin Glück <odi@odi.ch>
-
-
----
-
- drivers/input/mouse/appletouch.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
-index b4423a4..17381a9 100644
---- a/drivers/input/mouse/appletouch.c
-+++ b/drivers/input/mouse/appletouch.c
-@@ -127,7 +127,7 @@ MODULE_DEVICE_TABLE (usb, atp_table);
-  * Threshold for the touchpad sensors. Any change less than ATP_THRESHOLD is
-  * ignored.
-  */
--#define ATP_THRESHOLD	 5
-+#define ATP_THRESHOLD	 3
- 
- /* Geyser initialization constants */
- #define ATP_GEYSER_MODE_READ_REQUEST_ID		1
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch
deleted file mode 100644
index f7b4cb9..0000000
--- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Display Macbook Pro 1st gen controls when the subsystem id is wrong (0x100).
-
-From: Nicolas Boichat <nicolas@boichat.ch>
-
-
----
-
- sound/pci/hda/patch_sigmatel.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
-index 0401223..c0e626b 100644
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -2587,10 +2587,12 @@ static int patch_stac922x(struct hda_codec *codec)
- 		case 0x106b1700:
- 		case 0x106b0200:
- 		case 0x106b1e00:
-+		case 0x100: /* Invalid subsystem ID, happens randomly on
-+			     * MacBook Pro 1st generation
-+			     */
- 			spec->board_config = STAC_INTEL_MAC_V3;
- 			break;
- 		case 0x106b1a00:
--		case 0x00000100:
- 			spec->board_config = STAC_INTEL_MAC_V4;
- 			break;
- 		case 0x106b0a00:
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_fix_macbook_v2.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_fix_macbook_v2.patch
deleted file mode 100644
index a559167..0000000
--- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_fix_macbook_v2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fixes audio on Macbook v2.
-
-From: Marek Sterzik <marek@milimetr.org>
-
-
----
-
- sound/pci/hda/patch_sigmatel.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
-index c0e626b..e7995f6 100644
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -81,6 +81,7 @@ enum {
- 	/* for backward compatibility */
- 	STAC_MACMINI,
- 	STAC_MACBOOK,
-+	STAC_MACBOOK_V2,
- 	STAC_MACBOOK_PRO_V1,
- 	STAC_MACBOOK_PRO_V2,
- 	STAC_IMAC_INTEL,
-@@ -905,6 +906,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = {
- 	/* for backward compatibility */
- 	[STAC_MACMINI]	= "macmini",
- 	[STAC_MACBOOK]	= "macbook",
-+	[STAC_MACBOOK_V2]	= "macbook-v2",
- 	[STAC_MACBOOK_PRO_V1]	= "macbook-pro-v1",
- 	[STAC_MACBOOK_PRO_V2]	= "macbook-pro",
- 	[STAC_IMAC_INTEL] = "imac-intel",
diff --git a/sys-kernel/mactel-linux-sources/mactel-linux-sources-2.6.24.ebuild b/sys-kernel/mactel-linux-sources/mactel-linux-sources-2.6.24.ebuild
deleted file mode 100644
index 6ac591b..0000000
--- a/sys-kernel/mactel-linux-sources/mactel-linux-sources-2.6.24.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="Sources for the Linux kernel with mactel-linux and gentoo patches."
-HOMEPAGE="http://www.kernel.org 
-	http://dev.gentoo.org/~dsd/genpatches 
-	http://mactel-linux.org"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-KEYWORDS="~amd64 ~x86"
-
-PATCHDIR="${FILESDIR}/${PV}-mactel-patches-r148/"
-
-UNIPATCH_LIST="${PATCHDIR}/appletouch.patch \
-${PATCHDIR}/appletouch-add-macbook3-trackpad.patch \
-${PATCHDIR}/applesmc-case-led.patch \
-${PATCHDIR}/applesmc-macbook2.patch \
-${PATCHDIR}/applesmc-retry-when-accessing-keys.patch \
-${PATCHDIR}/applesmc_int.patch \
-${PATCHDIR}/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch \
-${PATCHDIR}/sigmatel_audio_fix_macbook_v2.patch"
-
-UNIPATCH_STRICTORDER="1"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, see:"
-	einfo "${HOMEPAGE}"
-	einfo "Report any problems to je_fro@gentoo.org"
-}
-