--- dsdt.dsl.orig	2005-03-03 14:46:09.000000000 +0100
+++ dsdt.dsl	2005-03-03 14:48:40.000000000 +0100
@@ -285,6 +285,7 @@
             }
 
             Store (0xE5, P80H)
+	    Return(Package(0x02){0x00, 0x00})
         }
 
         If (LEqual (SizeOf (\_OS), 0x27)) {}
@@ -3255,18 +3256,6 @@
                     Field (ERAM, ByteAcc, NoLock, Preserve)
                     {
                         Offset (0x1C), 
-                        SMW0,   16
-                    }
-
-                    Field (ERAM, ByteAcc, NoLock, Preserve)
-                    {
-                        Offset (0x1C), 
-                        SMB0,   8
-                    }
-
-                    Field (ERAM, ByteAcc, NoLock, Preserve)
-                    {
-                        Offset (0x1C), 
                         FLD0,   64
                     }
 
@@ -3295,98 +3284,6 @@
                     }
 
                     Name (ECUS, 0x00)
-                    Name (BATO, 0x00)
-                    Name (BATN, 0x00)
-                    Name (BATF, 0xC0)
-                    Method (_Q09, 0, NotSerialized)
-                    {
-                        If (LEqual (SizeOf (\_OS), 0x14)) {}
-                        If (LEqual (SizeOf (\_OS), 0x14))
-                        {
-                            BPOL (0x3C)
-                        }
-                    }
-
-                    Method (_Q20, 0, NotSerialized)
-                    {
-                        If (And (SMST, 0x40))
-                        {
-                            Store (SMAA, Local0)
-                            If (LEqual (Local0, 0x14))
-                            {
-                                And (SMST, 0xBF, SMST)
-                            }
-                        }
-                    }
-
-                    Method (SELE, 0, NotSerialized)
-                    {
-                        Store (BATD, BATN)
-                        Store (0x00, BATF)
-                        If (And (0xC0, BATN))
-                        {
-                            Or (BATF, 0x01, BATF)
-                        }
-
-                        If (And (0x0300, BATN))
-                        {
-                            Or (BATF, 0x04, BATF)
-                        }
-
-                        And (BATN, 0x01, Local0)
-                        And (BATO, 0x01, Local1)
-                        If (Local0)
-                        {
-                            Or (BATF, 0x0100, BATF)
-                        }
-                        Else
-                        {
-                            And (BATF, 0xFEFF, BATF)
-                        }
-
-                        If (Not (LEqual (Local0, Local1)))
-                        {
-                            Or (BATF, 0x40, BATF)
-                        }
-
-                        And (BATN, 0x02, Local0)
-                        And (BATO, 0x02, Local1)
-                        If (Local0)
-                        {
-                            Or (BATF, 0x0200, BATF)
-                        }
-                        Else
-                        {
-                            And (BATF, 0xFDFF, BATF)
-                        }
-
-                        If (Not (LEqual (Local0, Local1)))
-                        {
-                            Or (BATF, 0x80, BATF)
-                        }
-
-                        And (BATN, 0xC0, Local0)
-                        And (BATO, 0xC0, Local1)
-                        If (Not (LEqual (Local0, Local1)))
-                        {
-                            Or (BATF, 0x02, BATF)
-                        }
-
-                        If (And (0x01, BATF))
-                        {
-                            If (And (0x04, BATF))
-                            {
-                                If (And (BATN, 0x20))
-                                {
-                                    Or (BATF, 0x10, BATF)
-                                }
-                                Else
-                                {
-                                    Or (BATF, 0x20, BATF)
-                                }
-                            }
-                        }
-                    }
 
                     Method (_Q0D, 0, NotSerialized)
                     {
@@ -4544,10 +4441,7 @@
                                     }
                                 }
                             }
-                            Else
-                            {
-                                Return (0x08)
-                            }
+                            Return (0x08)
                         }
 
                         Method (_EJ0, 1, NotSerialized)
@@ -5031,5 +4925,9 @@
             CM32,   8
         }
     }
+
+INCLUDE ("smbus-cm.asl")
+INCLUDE ("sbs-cm-2b.asl")
+
 }