[LinuxBIOS] LNXI Merge: lnxi-patch-01/16

[jason schildt]

## lnxi-patch-1 ## - (2)files

src/southbridge/amd/amd8111/amd8111_acpi.c
     // amd8111_enable is commented out in public tree, but enabled in
     // hdama.
         resolution:  copied over for merge

DIFFSTAT
---------------------------------------------------------

  amd8111_acpi.c |    5 +++--
  amd8111_pci.c  |    1 +
    2 files changed, 4 insertions(+), 2 deletions(-)


PATCH
---------------------------------------------------------

Index: southbridge/amd/amd8111/amd8111_pci.c
===================================================================
--- southbridge/amd/amd8111/amd8111_pci.c       (revision 1105)
+++ southbridge/amd/amd8111/amd8111_pci.c       (working copy)
@@ -55,6 +55,7 @@
         .enable_resources = pci_bus_enable_resources,
         .init             = pci_init,
         .scan_bus         = pci_scan_bridge,
+       /* PCI Subordinate bus reset is not implemented */
         .ops_pci          = &lops_pci,
  };

Index: southbridge/amd/amd8111/amd8111_acpi.c
===================================================================
--- southbridge/amd/amd8111/amd8111_acpi.c      (revision 1105)
+++ southbridge/amd/amd8111/amd8111_acpi.c      (working copy)
@@ -97,6 +97,7 @@


  #endif
+       /* power after power fail */
         on = MAINBOARD_POWER_ON_AFTER_POWER_FAIL;
         get_option(&on, "power_on_after_fail");
         byte = pci_read_config8(dev, PREVIOUS_POWER_STATE);
@@ -106,7 +107,7 @@
         }
         pci_write_config8(dev, PREVIOUS_POWER_STATE, byte);
         printk_info("set power %s after power fail\n", on?"on":"off");
-
+
         /* Throttle the CPU speed down for testing */
         on = SLOW_CPU_OFF;
         get_option(&on, "slow_cpu");
@@ -177,7 +178,7 @@
         .enable_resources = acpi_enable_resources,
         .init             = acpi_init,
         .scan_bus         = scan_static_bus,
-//     .enable           = amd8111_enable,
+       .enable           = amd8111_enable,
         .ops_pci          = &lops_pci,
         .ops_smbus_bus    = &lops_smbus_bus,
  };

Using Opera's revolutionary e-mail client: http://www.opera.com/mail/