Messages in this thread Patch in this message | | | Date | Wed, 14 Jan 1998 11:03:56 +0300 (IST) | From | Gadi Oxman <> | Subject | Re: 2.1.79 fails compile -- ide requires CONFIG_PCI |
| |
On Tue, 13 Jan 1998, Pete Clements wrote:
> FYI: > > gcc -D__KERNEL__ -I/usr/src/linux-2.1.79/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -DCPU=486 -c -o ide-proc.o ide-proc.c > ide-proc.c: In function `proc_ide_write_settings':
Sorry; the following patch will move the above functions from the "#ifdef CONFIG_PCI" block.
Gadi
--- linux/drivers/block/ide-proc.c.old Wed Jan 14 10:22:19 1998 +++ linux/drivers/block/ide-proc.c Wed Jan 14 10:22:14 1998 @@ -87,16 +87,6 @@ return digit; } -static int ide_getdigit(char c) -{ - int digit; - if (isdigit(c)) - digit = c - '0'; - else - digit = -1; - return digit; -} - static int xx_xx_parse_error (const char *data, unsigned long len, const char *msg) { char errbuf[16]; @@ -254,24 +244,6 @@ return xx_xx_parse_error(start, startn, msg); } -static int proc_ide_read_drivers - (char *page, char **start, off_t off, int count, int *eof, void *data) -{ - char *out = page; - int len; - ide_module_t *p = ide_modules; - ide_driver_t *driver; - - while (p) { - driver = (ide_driver_t *) p->info; - if (p->type == IDE_DRIVER_MODULE && driver) - out += sprintf(out, "%s version %s\n", driver->name, driver->version); - p = p->next; - } - len = out - page; - PROC_IDE_READ_RETURN(page,start,off,count,eof,len); -} - static int proc_ide_read_config (char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -310,6 +282,34 @@ PROC_IDE_READ_RETURN(page,start,off,count,eof,len); } #endif /* CONFIG_PCI */ + +static int ide_getdigit(char c) +{ + int digit; + if (isdigit(c)) + digit = c - '0'; + else + digit = -1; + return digit; +} + +static int proc_ide_read_drivers + (char *page, char **start, off_t off, int count, int *eof, void *data) +{ + char *out = page; + int len; + ide_module_t *p = ide_modules; + ide_driver_t *driver; + + while (p) { + driver = (ide_driver_t *) p->info; + if (p->type == IDE_DRIVER_MODULE && driver) + out += sprintf(out, "%s version %s\n", driver->name, driver->version); + p = p->next; + } + len = out - page; + PROC_IDE_READ_RETURN(page,start,off,count,eof,len); +} static int proc_ide_read_type (char *page, char **start, off_t off, int count, int *eof, void *data)
| |