[PATCH] Fix toshiba.c and neofb.c for CONFIG_PROC_FS=n

From: "Noah J. Misch" <noah@caltech.edu>

Allows the Toshiba SMM driver to compile with CONFIG_PROC_FS=n.

diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 8a4ecd6316bd567e4a94f79598d4b1bead0546e6..15e2c72ed087856d343457208a57ca359b9558a1 100644 (file)
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -292,7 +292,7 @@ static int tosh_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
  * Print the information for /proc/toshiba
  */
 #ifdef CONFIG_PROC_FS
-int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
+static int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
 {
        char *temp;
        int key;

diff --git a/include/linux/toshiba.h b/include/linux/toshiba.h
index 8e57735c2476d43c8c8ce850aae3e74e3abe1577..916e5e3a699b695b963d2734fee707ffb7fc1af4 100644 (file)
--- a/include/linux/toshiba.h
+++ b/include/linux/toshiba.h
@@ -33,13 +33,4 @@ typedef struct {
        unsigned int edi __attribute__ ((packed));
 } SMMRegisters;
 
-#ifdef CONFIG_PROC_FS
-static int tosh_get_info(char *, char **, off_t, int);
-#else /* !CONFIG_PROC_FS */
-inline int tosh_get_info(char *buffer, char **start, off_t fpos, int lenght)
-{
-       return 0;
-}
-#endif /* CONFIG_PROC_FS */
-
 #endif