diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-17 19:09:09 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-17 19:12:33 -0400 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /include/acpi/platform/acgcc.h | |
| parent | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (diff) | |
| parent | f39cdf25bf77219676ec5360980ac40b1a7e144a (diff) | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'include/acpi/platform/acgcc.h')
| -rw-r--r-- | include/acpi/platform/acgcc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h index 935c5d7fc86e..6aadbf84ae71 100644 --- a/include/acpi/platform/acgcc.h +++ b/include/acpi/platform/acgcc.h | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | /* | 57 | /* |
| 58 | * Some compilers complain about unused variables. Sometimes we don't want to | 58 | * Some compilers complain about unused variables. Sometimes we don't want to |
| 59 | * use all the variables (for example, _acpi_module_name). This allows us | 59 | * use all the variables (for example, _acpi_module_name). This allows us |
| 60 | * to to tell the compiler warning in a per-variable manner that a variable | 60 | * to tell the compiler warning in a per-variable manner that a variable |
| 61 | * is unused. | 61 | * is unused. |
| 62 | */ | 62 | */ |
| 63 | #define ACPI_UNUSED_VAR __attribute__ ((unused)) | 63 | #define ACPI_UNUSED_VAR __attribute__ ((unused)) |