diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:43:52 -0500 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2010-03-01 09:43:52 -0500 |
commit | 94d8f785dd1f021c1971df73e6437f000c0d9449 (patch) | |
tree | d73b42a1cfac190234be138e352b531f07ddec68 | |
parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) |
dell-laptop: Fix build error by making buffer_mutex static
The following build bug (x86, allyesconfig):
arch/x86/oprofile/built-in.o:(.data+0x250): multiple definition of `buffer_mutex'
Was triggered in -tip testing, caused by this upstream commit:
116ee77: dell-laptop: Use buffer with 32-bit physical address
There's multiple buffer_mutex's in the kernel. Make this new one
static.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | drivers/platform/x86/dell-laptop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index b7f4d2705916..29d96a4f5769 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c | |||
@@ -132,8 +132,8 @@ static struct dmi_system_id __devinitdata dell_blacklist[] = { | |||
132 | }; | 132 | }; |
133 | 133 | ||
134 | static struct calling_interface_buffer *buffer; | 134 | static struct calling_interface_buffer *buffer; |
135 | struct page *bufferpage; | 135 | static struct page *bufferpage; |
136 | DEFINE_MUTEX(buffer_mutex); | 136 | static DEFINE_MUTEX(buffer_mutex); |
137 | 137 | ||
138 | static int hwswitch_state; | 138 | static int hwswitch_state; |
139 | 139 | ||