From 089481f07d7b75b49560e92a5dd66cce381295a5 Mon Sep 17 00:00:00 2001 From: Frodo Looijaard Date: Thu, 18 Feb 1999 14:31:54 +0000 Subject: [PATCH] Two insignificant patches to remove 2.0.x kernel compile warnings. It compiles now cleanly against kernel 2.0.36; I checked, double-checked and cross-checked. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@247 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/busses/i2c-ali15x3.c | 2 +- kernel/i2c-proc.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/busses/i2c-ali15x3.c b/kernel/busses/i2c-ali15x3.c index 8efcd1e0..fb5b7e51 100644 --- a/kernel/busses/i2c-ali15x3.c +++ b/kernel/busses/i2c-ali15x3.c @@ -178,7 +178,7 @@ int ali15x3_setup(void) struct pci_dev *ALI15X3_dev; #else unsigned char ALI15X3_bus, ALI15X3_devfn = 0; - int i,res; + int res; #endif /* First check whether we can access PCI at all */ diff --git a/kernel/i2c-proc.c b/kernel/i2c-proc.c index 294c4227..627fc26a 100644 --- a/kernel/i2c-proc.c +++ b/kernel/i2c-proc.c @@ -394,7 +394,13 @@ int i2cproc_attach_adapter(struct i2c_adapter *adapter) proc_entry->mode = S_IRUGO | S_IFREG; proc_entry->nlink = 1; proc_entry->ops = &i2cproc_inode_operations; - strcpy((char *) proc_entry->name,name); + + /* Nasty stuff to keep GCC satisfied */ + { + char *procname; + (const char *) procname = proc_entry->name; + strcpy (procname,name); + } if ((res = proc_register_dynamic(&proc_bus_dir, proc_entry))) { printk("i2c-proc.o: Could not create %s.\n",name);