Index: drivers/bus/acpi/busmgr/bus.c
===================================================================
--- drivers/bus/acpi/busmgr/bus.c	(revision 63626)
+++ drivers/bus/acpi/busmgr/bus.c	(working copy)
@@ -724,8 +724,7 @@
 	switch (type) {
 
 	case ACPI_NOTIFY_BUS_CHECK:
-		DPRINT("Received BUS CHECK notification for device [%s]\n", 
-			device->pnp.bus_id);
+		DPRINT("Received BUS CHECK notification...");
 		acpi_bus_check_scope(handle);
 		/* 
 		 * TBD: We'll need to outsource certain events to non-ACPI
@@ -734,8 +733,7 @@
 		break;
 
 	case ACPI_NOTIFY_DEVICE_CHECK:
-		DPRINT("Received DEVICE CHECK notification for device [%s]\n", 
-			device->pnp.bus_id);
+		DPRINT("Received DEVICE CHECK notification...");
 		acpi_bus_check_device(handle);
 		/* 
 		 * TBD: We'll need to outsource certain events to non-ACPI
@@ -744,8 +742,7 @@
 		break;
 
 	case ACPI_NOTIFY_DEVICE_WAKE:
-		DPRINT("Received DEVICE WAKE notification for device [%s]\n", 
-			device->pnp.bus_id);
+		DPRINT("Received DEVICE WAKE notification...");
 		acpi_bus_check_device(handle);
 		/*
 		 * TBD: We'll need to outsource certain events to non-ACPI
@@ -754,32 +751,27 @@
 		break;
 
 	case ACPI_NOTIFY_EJECT_REQUEST:
-		DPRINT1("Received EJECT REQUEST notification for device [%s]\n", 
-			device->pnp.bus_id);
+		DPRINT1("Received EJECT REQUEST notification...");
 		/* TBD */
 		break;
 
 	case ACPI_NOTIFY_DEVICE_CHECK_LIGHT:
-		DPRINT1("Received DEVICE CHECK LIGHT notification for device [%s]\n", 
-			device->pnp.bus_id);
+		DPRINT1("Received DEVICE CHECK LIGHT notification...");
 		/* TBD: Exactly what does 'light' mean? */
 		break;
 
 	case ACPI_NOTIFY_FREQUENCY_MISMATCH:
-		DPRINT1("Received FREQUENCY MISMATCH notification for device [%s]\n", 
-			device->pnp.bus_id);
+		DPRINT1("Received FREQUENCY MISMATCH notification...");
 		/* TBD */
 		break;
 
 	case ACPI_NOTIFY_BUS_MODE_MISMATCH:
-		DPRINT1("Received BUS MODE MISMATCH notification for device [%s]\n", 
-			device->pnp.bus_id);
+		DPRINT1("Received BUS MODE MISMATCH notification...");
 		/* TBD */
 		break;
 
 	case ACPI_NOTIFY_POWER_FAULT:
-		DPRINT1("Received POWER FAULT notification for device [%s]\n", 
-			device->pnp.bus_id);
+		DPRINT1("Received POWER FAULT notification...");
 		/* TBD */
 		break;
 
@@ -791,8 +783,9 @@
 
 	acpi_bus_get_device(handle, &device);
 	if (device) {
+        DPRINT("...for device [%s] \n", device->pnp.bus_id);
 		driver = device->driver;
-		if (driver && driver->ops.notify &&
+		if (driver && drive r->ops.notify &&
 		    (driver->flags & ACPI_DRIVER_ALL_NOTIFY_EVENTS))
 			driver->ops.notify(device, type);
 	}