aboutsummaryrefslogtreecommitdiff
path: root/drivers/platform/x86/thinkpad_acpi.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:12:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:43 +0900
commit3bd018969c57e639ebfc30042d44433e30e03d35 (patch)
treec4cf5e282d354b4ff7ce830bd71055e5df226e59 /drivers/platform/x86/thinkpad_acpi.c
parent15c0665c2f61d4312255d8952197e5f90a11c1e3 (diff)
downloadlinux-linaro-stable-3bd018969c57e639ebfc30042d44433e30e03d35.tar.gz
sections: fix section conflicts in drivers/platform/x86
Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Matthew Garrett <mjg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/platform/x86/thinkpad_acpi.c')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 9da5fe715e6a..75dd651664ae 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -522,7 +522,7 @@ static acpi_handle ec_handle;
#define TPACPI_HANDLE(object, parent, paths...) \
static acpi_handle object##_handle; \
- static const acpi_handle *object##_parent __initdata = \
+ static const acpi_handle * const object##_parent __initconst = \
&parent##_handle; \
static char *object##_paths[] __initdata = { paths }