dell-laptop: Fix build error by making buffer_mutex static
authorIngo Molnar <mingo@elte.hu>
Mon, 1 Mar 2010 14:43:52 +0000 (09:43 -0500)
committerMatthew Garrett <mjg@redhat.com>
Mon, 1 Mar 2010 14:43:52 +0000 (09:43 -0500)
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>
drivers/platform/x86/dell-laptop.c

index b7f4d27..29d96a4 100644 (file)
@@ -132,8 +132,8 @@ static struct dmi_system_id __devinitdata dell_blacklist[] = {
 };
 
 static struct calling_interface_buffer *buffer;
-struct page *bufferpage;
-DEFINE_MUTEX(buffer_mutex);
+static struct page *bufferpage;
+static DEFINE_MUTEX(buffer_mutex);
 
 static int hwswitch_state;