From 6233eaefb18dcf0954d5bb07e70044ec8464ea3b Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 21 Oct 2003 18:23:44 -0700 Subject: [PATCH] [PATCH] Fix toshiba.c and neofb.c for CONFIG_PROC_FS=n From: "Noah J. Misch" Allows the Toshiba SMM driver to compile with CONFIG_PROC_FS=n. --- drivers/char/toshiba.c | 2 +- include/linux/toshiba.h | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c index 8a4ecd6316bd5..15e2c72ed0878 100644 --- 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 8e57735c2476d..916e5e3a699b6 100644 --- 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 -- 2.53.0