diff options
| author | Andi Kleen <ak@muc.de> | 2004-08-22 22:44:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 22:44:01 -0700 |
| commit | 2ec62836f575faf8f35409ede72f8f78c44a33d8 (patch) | |
| tree | 385431ba07390deaecf23351f36673b0cabd6bd3 | |
| parent | 65cae9f4a1e7f3d69f73ac9b83a01b143f5dc642 (diff) | |
[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>
| -rw-r--r-- | drivers/char/sonypi.c | 3 | ||||
| -rw-r--r-- | drivers/char/sonypi.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index 28418d57fb10..0a517eb28b93 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 0eb8f46ab71e..58bbf385b107 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) |