diff -urN linux-2.4.26-wt5-7x/drivers/acpi/ac.c linux-2.4.26-wt5/drivers/acpi/ac.c
--- linux-2.4.26-wt5-7x/drivers/acpi/ac.c	Sun May  9 16:21:18 2004
+++ linux-2.4.26-wt5/drivers/acpi/ac.c	Sun May  9 16:21:28 2004
@@ -156,7 +156,6 @@
 			acpi_ac_dir);
 		if (!acpi_device_dir(device))
 			return_VALUE(-ENODEV);
-		acpi_device_dir(device)->owner = THIS_MODULE;
 	}
 
 	/* 'state' [R] */
@@ -169,7 +168,6 @@
 	else {
 		entry->read_proc = acpi_ac_read_state;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	return_VALUE(0);
@@ -320,7 +318,6 @@
 	acpi_ac_dir = proc_mkdir(ACPI_AC_CLASS, acpi_root_dir);
 	if (!acpi_ac_dir)
 		return_VALUE(-ENODEV);
-	acpi_ac_dir->owner = THIS_MODULE;
 
 	result = acpi_bus_register_driver(&acpi_ac_driver);
 	if (result < 0) {
diff -urN linux-2.4.26-wt5-7x/drivers/acpi/battery.c linux-2.4.26-wt5/drivers/acpi/battery.c
--- linux-2.4.26-wt5-7x/drivers/acpi/battery.c	Sun May  9 16:21:18 2004
+++ linux-2.4.26-wt5/drivers/acpi/battery.c	Sun May  9 16:21:28 2004
@@ -613,7 +613,6 @@
 			acpi_battery_dir);
 		if (!acpi_device_dir(device))
 			return_VALUE(-ENODEV);
-		acpi_device_dir(device)->owner = THIS_MODULE;
 	}
 
 	/* 'info' [R] */
@@ -626,7 +625,6 @@
 	else {
 		entry->read_proc = acpi_battery_read_info;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'status' [R] */
@@ -639,7 +637,6 @@
 	else {
 		entry->read_proc = acpi_battery_read_state;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'alarm' [R/W] */
@@ -653,7 +650,6 @@
 		entry->read_proc = acpi_battery_read_alarm;
 		entry->write_proc = acpi_battery_write_alarm;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	return_VALUE(0);
@@ -805,7 +801,6 @@
 	acpi_battery_dir = proc_mkdir(ACPI_BATTERY_CLASS, acpi_root_dir);
 	if (!acpi_battery_dir)
 		return_VALUE(-ENODEV);
-	acpi_battery_dir->owner = THIS_MODULE;
 
 	result = acpi_bus_register_driver(&acpi_battery_driver);
 	if (result < 0) {
diff -urN linux-2.4.26-wt5-7x/drivers/acpi/button.c linux-2.4.26-wt5/drivers/acpi/button.c
--- linux-2.4.26-wt5-7x/drivers/acpi/button.c	Sun May  9 16:21:18 2004
+++ linux-2.4.26-wt5/drivers/acpi/button.c	Sun May  9 16:21:28 2004
@@ -173,15 +173,10 @@
 				acpi_button_dir);
 		break;
 	}
-	
-	if (!entry)
-		return_VALUE(-ENODEV);
-	entry->owner = THIS_MODULE;
 
 	acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), entry);
 	if (!acpi_device_dir(device))
 		return_VALUE(-ENODEV);
-	acpi_device_dir(device)->owner = THIS_MODULE;
 
 	/* 'info' [R] */
 	entry = create_proc_entry(ACPI_BUTTON_FILE_INFO,
@@ -193,7 +188,6 @@
 	else {
 		entry->read_proc = acpi_button_read_info;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 	
 	if (button->type==ACPI_BUTTON_TYPE_LID){
@@ -207,7 +201,6 @@
 	    else {
 		entry->read_proc = acpi_button_lid_read_state;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	    }
 	}
 
@@ -219,28 +212,10 @@
 acpi_button_remove_fs (
 	struct acpi_device	*device)
 {
-	struct acpi_button	*button = NULL;
-
 	ACPI_FUNCTION_TRACE("acpi_button_remove_fs");
 
-	button = acpi_driver_data(device);
 	if (acpi_device_dir(device)) {
-		switch (button->type) {
-			case ACPI_BUTTON_TYPE_POWER:
-			case ACPI_BUTTON_TYPE_POWERF:
-				remove_proc_entry(ACPI_BUTTON_SUBCLASS_POWER, 
-					acpi_button_dir);
-				break;
-			case ACPI_BUTTON_TYPE_SLEEP:
-			case ACPI_BUTTON_TYPE_SLEEPF:
-				remove_proc_entry(ACPI_BUTTON_SUBCLASS_SLEEP, 
-					acpi_button_dir);
-				break;
-			case ACPI_BUTTON_TYPE_LID:
-				remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, 
-					acpi_button_dir);
-				break;
-		}
+		remove_proc_entry(acpi_device_bid(device), acpi_button_dir);
 		acpi_device_dir(device) = NULL;
 	}
 
@@ -497,7 +472,6 @@
 	acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
 	if (!acpi_button_dir)
 		return_VALUE(-ENODEV);
-	acpi_button_dir->owner = THIS_MODULE;
 
 	result = acpi_bus_register_driver(&acpi_button_driver);
 	if (result < 0) {
diff -urN linux-2.4.26-wt5-7x/drivers/acpi/fan.c linux-2.4.26-wt5/drivers/acpi/fan.c
--- linux-2.4.26-wt5-7x/drivers/acpi/fan.c	Sun May  9 16:21:18 2004
+++ linux-2.4.26-wt5/drivers/acpi/fan.c	Sun May  9 16:21:28 2004
@@ -151,7 +151,6 @@
 			acpi_fan_dir);
 		if (!acpi_device_dir(device))
 			return_VALUE(-ENODEV);
-		acpi_device_dir(device)->owner = THIS_MODULE;
 	}
 
 	/* 'status' [R/W] */
@@ -165,7 +164,6 @@
 		entry->read_proc = acpi_fan_read_state;
 		entry->write_proc = acpi_fan_write_state;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	return_VALUE(0);
@@ -269,7 +267,6 @@
 	acpi_fan_dir = proc_mkdir(ACPI_FAN_CLASS, acpi_root_dir);
 	if (!acpi_fan_dir)
 		return_VALUE(-ENODEV);
-	acpi_fan_dir->owner = THIS_MODULE;
 
 	result = acpi_bus_register_driver(&acpi_fan_driver);
 	if (result < 0) {
diff -urN linux-2.4.26-wt5-7x/drivers/acpi/processor.c linux-2.4.26-wt5/drivers/acpi/processor.c
--- linux-2.4.26-wt5-7x/drivers/acpi/processor.c	Sun May  9 16:21:18 2004
+++ linux-2.4.26-wt5/drivers/acpi/processor.c	Sun May  9 16:21:28 2004
@@ -2011,7 +2011,6 @@
 		if (!acpi_device_dir(device))
 			return_VALUE(-ENODEV);
 	}
-	acpi_device_dir(device)->owner = THIS_MODULE;
 
 	/* 'info' [R] */
 	entry = create_proc_entry(ACPI_PROCESSOR_FILE_INFO,
@@ -2023,7 +2022,6 @@
 	else {
 		entry->read_proc = acpi_processor_read_info;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'power' [R] */
@@ -2036,7 +2034,6 @@
 	else {
 		entry->read_proc = acpi_processor_read_power;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'performance' [R/W] */
@@ -2050,7 +2047,6 @@
 		entry->read_proc = acpi_processor_read_performance;
 		entry->write_proc = acpi_processor_write_performance;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'throttling' [R/W] */
@@ -2064,7 +2060,6 @@
 		entry->read_proc = acpi_processor_read_throttling;
 		entry->write_proc = acpi_processor_write_throttling;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'limit' [R/W] */
@@ -2078,7 +2073,6 @@
 		entry->read_proc = acpi_processor_read_limit;
 		entry->write_proc = acpi_processor_write_limit;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	return_VALUE(0);
@@ -2355,7 +2349,6 @@
 	acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
 	if (!acpi_processor_dir)
 		return_VALUE(-ENODEV);
-	acpi_processor_dir->owner = THIS_MODULE;
 
 	result = acpi_bus_register_driver(&acpi_processor_driver);
 	if (result < 0) {
diff -urN linux-2.4.26-wt5-7x/drivers/acpi/thermal.c linux-2.4.26-wt5/drivers/acpi/thermal.c
--- linux-2.4.26-wt5-7x/drivers/acpi/thermal.c	Sun May  9 16:21:18 2004
+++ linux-2.4.26-wt5/drivers/acpi/thermal.c	Sun May  9 16:21:28 2004
@@ -1051,7 +1051,6 @@
 			acpi_thermal_dir);
 		if (!acpi_device_dir(device))
 			return_VALUE(-ENODEV);
-		acpi_device_dir(device)->owner = THIS_MODULE;
 	}
 
 	/* 'state' [R] */
@@ -1064,7 +1063,6 @@
 	else {
 		entry->read_proc = acpi_thermal_read_state;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'temperature' [R] */
@@ -1077,7 +1075,6 @@
 	else {
 		entry->read_proc = acpi_thermal_read_temperature;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'trip_points' [R/W] */
@@ -1091,7 +1088,6 @@
 		entry->read_proc = acpi_thermal_read_trip_points;
 		entry->write_proc = acpi_thermal_write_trip_points;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'cooling_mode' [R/W] */
@@ -1105,7 +1101,6 @@
 		entry->read_proc = acpi_thermal_read_cooling_mode;
 		entry->write_proc = acpi_thermal_write_cooling_mode;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	/* 'polling_frequency' [R/W] */
@@ -1119,7 +1114,6 @@
 		entry->read_proc = acpi_thermal_read_polling;
 		entry->write_proc = acpi_thermal_write_polling;
 		entry->data = acpi_driver_data(device);
-		entry->owner = THIS_MODULE;
 	}
 
 	return_VALUE(0);
@@ -1338,7 +1332,6 @@
 	acpi_thermal_dir = proc_mkdir(ACPI_THERMAL_CLASS, acpi_root_dir);
 	if (!acpi_thermal_dir)
 		return_VALUE(-ENODEV);
-	acpi_thermal_dir->owner = THIS_MODULE;
 
 	result = acpi_bus_register_driver(&acpi_thermal_driver);
 	if (result < 0) {
diff -urN linux-2.4.26-wt5-7x/drivers/acpi/toshiba_acpi.c linux-2.4.26-wt5/drivers/acpi/toshiba_acpi.c
--- linux-2.4.26-wt5-7x/drivers/acpi/toshiba_acpi.c	Sun May  9 16:21:18 2004
+++ linux-2.4.26-wt5/drivers/acpi/toshiba_acpi.c	Sun May  9 16:21:28 2004
@@ -503,8 +503,6 @@
 		proc = create_proc_read_entry(item->name,
 			S_IFREG | S_IRUGO | S_IWUSR,
 			toshiba_proc_dir, (read_proc_t*)dispatch_read, item);
-		if (proc)
-			proc->owner = THIS_MODULE;
 		if (proc && item->write_func)
 			proc->write_proc = (write_proc_t*)dispatch_write;
 	}
@@ -552,7 +550,6 @@
 	if (!toshiba_proc_dir) {
 		status = AE_ERROR;
 	} else {
-		toshiba_proc_dir->owner = THIS_MODULE;
 		status = add_device();
 		if (ACPI_FAILURE(status))
 			remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);