* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: gcc-4.6: ACPI: fix unused but set variables in ACPI ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS ACPI processor: remove deprecated ACPI procfs I/F ACPI power_resource: remove unused procfs I/F ACPI: remove deprecated ACPI procfs I/F ACPI: introduce drivers/acpi/sysfs.c ACPI: introduce module parameter acpi.aml_debug_output ACPI: introduce drivers/acpi/debugfs.c ACPI, APEI, ERST debug support ACPI, APEI, Manage GHES as platform devices ACPI, APEI, Rename CPER and GHES severity constants ACPI, APEI, Fix a typo of error path of apei_resources_request ACPI / ACPICA: Fix reference counting problems with GPE handlers ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device ACPI / Sleep: Drop acpi_suspend_finish() ACPI / Sleep: Consolidate suspend and hibernation routines ACPI / Wakeup: Simplify enabling of wakeup devices ACPI / Sleep: Rework enabling wakeup devices ACPI / Sleep: Free NVS copy if suspending of devices fails Fixed up totally buggered "ACPI: fix unused but set variables in ACPI" patch that doesn't even compile in the merge. Thanks to Sedat Dilek <sedat.dilek@googlemail.com> for noticing the breakage before I even pulled. And a big "Grrr.." at Len for not even bothering to compile the tree before asking me to pull.
Showing the changes to include (3 of 40 files). Show all
Unified · Split
| @@ -66,7 +66,7 @@ extern u8 acpi_gbl_create_osi_method; · 65 unmodified lines | ||
| 66 | 66 | extern u8 acpi_gbl_use_default_register_widths; |
| 67 | 67 | extern acpi_name acpi_gbl_trace_method_name; |
| 68 | 68 | extern u32 acpi_gbl_trace_flags; |
| 69 | −extern u8 acpi_gbl_enable_aml_debug_object; | |
| 69 | +extern u32 acpi_gbl_enable_aml_debug_object; | |
| 70 | 70 | extern u8 acpi_gbl_copy_dsdt_locally; |
| 71 | 71 | extern u8 acpi_gbl_truncate_io_addresses; |
| 72 | 72 | |
| @@ -338,7 +338,6 @@ extern struct cpuidle_driver acpi_idle_driver; · 337 unmodified lines | ||
| 338 | 338 | |
| 339 | 339 | /* in processor_thermal.c */ |
| 340 | 340 | int acpi_processor_get_limit_info(struct acpi_processor *pr); |
| 341 | −extern const struct file_operations acpi_processor_limit_fops; | |
| 342 | 341 | extern struct thermal_cooling_device_ops processor_cooling_ops; |
| 343 | 342 | #ifdef CONFIG_CPU_FREQ |
| 344 | 343 | void acpi_thermal_cpufreq_init(void); |
| @@ -39,10 +39,10 @@ · 38 unmodified lines | ||
| 39 | 39 | * Severity difinition for error_severity in struct cper_record_header |
| 40 | 40 | * and section_severity in struct cper_section_descriptor |
| 41 | 41 | */ |
| 42 | −#define CPER_SER_RECOVERABLE 0x0 | |
| 43 | −#define CPER_SER_FATAL 0x1 | |
| 44 | −#define CPER_SER_CORRECTED 0x2 | |
| 45 | −#define CPER_SER_INFORMATIONAL 0x3 | |
| 42 | +#define CPER_SEV_RECOVERABLE 0x0 | |
| 43 | +#define CPER_SEV_FATAL 0x1 | |
| 44 | +#define CPER_SEV_CORRECTED 0x2 | |
| 45 | +#define CPER_SEV_INFORMATIONAL 0x3 | |
| 46 | 46 | |
| 47 | 47 | /* |
| 48 | 48 | * Validation bits difinition for validation_bits in struct |