acpica-unix2-20130823
PANKOVs restructure

@@ -27,11 +27,11 @@
 #define _SYS_ACPIDEV_H
 #include <sys/types.h>
 #include <sys/obpdefs.h>
 #include <sys/sunddi.h>
 #ifdef  _KERNEL
-#include <sys/acpi/acpi.h>
+#include <acpica/include/acpi.h>
 #include <sys/acpica.h>
 #endif
 
 #ifdef __cplusplus
 extern "C" {

@@ -126,11 +126,11 @@
 #define ACPIDEV_OUSER_NO_CACHE          0x10000
 
 #ifdef  _KERNEL
 
 /* Common ACPI object names. */
-#define ACPIDEV_OBJECT_NAME_SB          ACPI_NS_SYSTEM_BUS
+#define ACPIDEV_OBJECT_NAME_SB          METHOD_NAME__SB_
 #define ACPIDEV_OBJECT_NAME_PR          "_PR_"
 
 /* Common ACPI method names. */
 #define ACPIDEV_METHOD_NAME_MAT         "_MAT"
 #define ACPIDEV_METHOD_NAME_EJ0         "_EJ0"