~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/acpi/bus.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
227
227
        acpi_status status = AE_OK;
228
228
        char object_name[5] = { '_', 'P', 'S', '0' + state, '\0' };
229
229
 
230
 
        if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
 
230
        if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))
231
231
                return -EINVAL;
232
232
 
233
233
        /* Make sure this is a valid target state */
1030
1030
        pci_mmcfg_late_init();
1031
1031
        acpi_scan_init();
1032
1032
        acpi_ec_init();
1033
 
        /*acpi_debugfs_init();*/
 
1033
        acpi_debugfs_init();
1034
1034
        acpi_sleep_proc_init();
1035
1035
        acpi_wakeup_device_init();
1036
1036
        return 0;