aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndi Kleen <ak@muc.de>2004-08-22 22:44:01 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-22 22:44:01 -0700
commit2ec62836f575faf8f35409ede72f8f78c44a33d8 (patch)
tree385431ba07390deaecf23351f36673b0cabd6bd3 /drivers
parent65cae9f4a1e7f3d69f73ac9b83a01b143f5dc642 (diff)
downloadhistory-2ec62836f575faf8f35409ede72f8f78c44a33d8.tar.gz
[PATCH] gcc-3.5 fixes
Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/sonypi.c3
-rw-r--r--drivers/char/sonypi.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 28418d57fb10cc..0a517eb28b933c 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -50,12 +50,13 @@
#include <asm/io.h>
#include <asm/system.h>
+static int verbose; /* = 0 */
+
#include "sonypi.h"
#include <linux/sonypi.h>
static struct sonypi_device sonypi_device;
static int minor = -1;
-static int verbose; /* = 0 */
static int fnkeyinit; /* = 0 */
static int camera; /* = 0 */
static int compat; /* = 0 */
diff --git a/drivers/char/sonypi.h b/drivers/char/sonypi.h
index 0eb8f46ab71eb8..58bbf385b1079d 100644
--- a/drivers/char/sonypi.h
+++ b/drivers/char/sonypi.h
@@ -401,8 +401,6 @@ struct sonypi_device {
#define SONYPI_ACPI_ACTIVE 0
#endif /* CONFIG_ACPI */
-extern int verbose;
-
static inline int sonypi_ec_write(u8 addr, u8 value) {
#ifdef CONFIG_ACPI_EC
if (SONYPI_ACPI_ACTIVE)