--- acpi4asus-0.30/driver/Makefile~	2005-04-13 14:18:24.000000000 +0100
+++ acpi4asus-0.30/driver/Makefile	2006-11-16 19:43:53.000000000 +0000
@@ -28,7 +28,7 @@
 KMODNAME=asus_acpi
 KMODSRC=asus_core
 INCLUDE=`./get_include.sh $(KERNELSRC)/drivers/acpi $(KERNELSRC)/include/acpi`
-LINUX_VERSION=$(shell grep UTS_RELEASE $(KERNELSRC)/include/linux/version.h | cut -b24)
+LINUX_VERSION=$(shell cat $(KERNELSRC)/include/linux/{utsrelease,version}.h 2>/dev/null | grep UTS_RELEASE | cut -b24)
 
 include $(KERNELSRC)/.config
 OBJS = $(KMODSRC).o
--- acpi4asus-0.30/driver/asus_core.c	2006-01-17 22:29:28.000000000 +0100
+++ acpi4asus-0.30/driver/asus_core.c	2006-11-21 22:24:42.000000000 +0000
@@ -30,6 +30,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -1138,7 +1139,7 @@
 	 * HID), this bit will be moved. A global variable asus_info contains
 	 * the DSDT header.
 	 */
-	status = acpi_get_table(ACPI_TABLE_DSDT, 1, &dsdt);
+	status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt);
 	if (ACPI_FAILURE(status))
 		printk(KERN_WARNING "  Couldn't get the DSDT table header\n");
 	else
@@ -1173,7 +1173,7 @@
 				string = model->buffer.pointer;
 				break;
 			default:
-				acpi_os_free(model);
+				kfree(model);
 				break;
 		}
 	}
@@ -1223,7 +1223,7 @@
 	/* S1300A reports L84F, but L1400B too, account for that */
 	}
 
-	acpi_os_free(model);
+	kfree(model);
 
 	return AE_OK;
 }
@@ -1352,7 +1352,7 @@
 	asus_proc_dir->owner = THIS_MODULE;
 
 	result = acpi_bus_register_driver(&asus_hotk_driver);
-	if (result < 1) {
+	if (result < 0) {
 		acpi_bus_unregister_driver(&asus_hotk_driver);
 		remove_proc_entry(PROC_ASUS, acpi_root_dir);
 		return -ENODEV;
@@ -1367,7 +1367,7 @@
 	acpi_bus_unregister_driver(&asus_hotk_driver);
 	remove_proc_entry(PROC_ASUS, acpi_root_dir);
 
-	acpi_os_free(asus_info);
+	kfree(asus_info);
 
 	return;
 }