From: Andi Kleen <ak@muc.de>

Trivial gcc-3.5 build fixes.

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/drivers/char/sonypi.c |    3 ++-
 25-akpm/drivers/char/sonypi.h |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff -puN drivers/char/sonypi.c~gcc35-sonypi drivers/char/sonypi.c
--- 25/drivers/char/sonypi.c~gcc35-sonypi	2004-07-10 17:52:25.615548568 -0700
+++ 25-akpm/drivers/char/sonypi.c	2004-07-10 17:52:25.621547656 -0700
@@ -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 -puN drivers/char/sonypi.h~gcc35-sonypi drivers/char/sonypi.h
--- 25/drivers/char/sonypi.h~gcc35-sonypi	2004-07-10 17:52:25.617548264 -0700
+++ 25-akpm/drivers/char/sonypi.h	2004-07-10 17:52:25.622547504 -0700
@@ -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)
_