Commit 6233eaef authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent 9ef76d34
...@@ -292,7 +292,7 @@ static int tosh_ioctl(struct inode *ip, struct file *fp, unsigned int cmd, ...@@ -292,7 +292,7 @@ static int tosh_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
* Print the information for /proc/toshiba * Print the information for /proc/toshiba
*/ */
#ifdef CONFIG_PROC_FS #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; char *temp;
int key; int key;
......
...@@ -33,13 +33,4 @@ typedef struct { ...@@ -33,13 +33,4 @@ typedef struct {
unsigned int edi __attribute__ ((packed)); unsigned int edi __attribute__ ((packed));
} SMMRegisters; } 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 #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment