~ubuntu-branches/ubuntu/precise/linux-lts-quantal/precise-updates

« back to all changes in this revision

Viewing changes to drivers/acpi/osl.c

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Luis Henriques, Tim Gardner
  • Date: 2013-02-07 12:08:38 UTC
  • Revision ID: package-import@ubuntu.com-20130207120838-8jaukepmb85dkevq
Tags: 3.5.0-24.37~precise1
[Luis Henriques]

* Release Tracking Bug
  - LP: #1118287

[ Tim Gardner ]

* [Config] CONFIG_ALX=m for x86 only
  - LP: #927782

Show diffs side-by-side

added added

removed removed

Lines of Context:
250
250
                return acpi_rsdp;
251
251
#endif
252
252
 
253
 
        if (efi_enabled) {
 
253
        if (efi_enabled(EFI_CONFIG_TABLES)) {
254
254
                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
255
255
                        return efi.acpi20;
256
256
                else if (efi.acpi != EFI_INVALID_TABLE_ADDR)