rpms/kernel/devel linux-2.6-warnings-register.patch, NONE, 1.1 kernel-2.6.spec, 1.3076, 1.3077

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30365

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-warnings-register.patch 
Log Message:
more warning fixes

linux-2.6-warnings-register.patch:
 hwmon/w83791d.c                |    4 ++--
 isdn/hardware/eicon/platform.h |    2 +-
 net/wireless/airo.c            |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-warnings-register.patch ---
'register' is a reserved keyword.  Gcc is smart enough to ignore this,
but gets whiney when you turn up the warnings.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.20.noarch/drivers/isdn/hardware/eicon/platform.h~	2007-04-16 17:55:55.000000000 -0400
+++ linux-2.6.20.noarch/drivers/isdn/hardware/eicon/platform.h	2007-04-16 17:56:08.000000000 -0400
@@ -207,7 +207,7 @@ void PCIread (byte bus, byte func, int o
 /*
 **  I/O Port utilities
 */
-int diva_os_register_io_port (void *adapter, int register, unsigned long port,
+int diva_os_register_io_port (void *adapter, int reg, unsigned long port,
 				unsigned long length, const char* name, int id);
 /*
 **  I/O port access abstraction
--- linux-2.6.20.noarch/drivers/net/wireless/airo.c~	2007-04-16 17:56:48.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/airo.c	2007-04-16 17:57:01.000000000 -0400
@@ -1090,8 +1090,8 @@ static const char version[] = "airo.c 0.
 struct airo_info;
 
 static int get_dec_u16( char *buffer, int *start, int limit );
-static void OUT4500( struct airo_info *, u16 register, u16 value );
-static unsigned short IN4500( struct airo_info *, u16 register );
+static void OUT4500( struct airo_info *, u16 reg, u16 value );
+static unsigned short IN4500( struct airo_info *, u16 reg);
 static u16 setup_card(struct airo_info*, u8 *mac, int lock);
 static int enable_MAC( struct airo_info *ai, Resp *rsp, int lock );
 static void disable_MAC(struct airo_info *ai, int lock);
--- linux-2.6.20.noarch/drivers/hwmon/w83791d.c~	2007-04-16 17:57:12.000000000 -0400
+++ linux-2.6.20.noarch/drivers/hwmon/w83791d.c	2007-04-16 17:57:29.000000000 -0400
@@ -289,8 +289,8 @@ static int w83791d_attach_adapter(struct
 static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind);
 static int w83791d_detach_client(struct i2c_client *client);
 
-static int w83791d_read(struct i2c_client *client, u8 register);
-static int w83791d_write(struct i2c_client *client, u8 register, u8 value);
+static int w83791d_read(struct i2c_client *client, u8 reg);
+static int w83791d_write(struct i2c_client *client, u8 reg, u8 value);
 static struct w83791d_data *w83791d_update_device(struct device *dev);
 
 #ifdef DEBUG


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3076
retrieving revision 1.3077
diff -u -r1.3076 -r1.3077
--- kernel-2.6.spec	16 Apr 2007 21:35:11 -0000	1.3076
+++ kernel-2.6.spec	16 Apr 2007 22:01:38 -0000	1.3077
@@ -602,6 +602,7 @@
 Patch10000: linux-2.6-compile-fixes.patch
 Patch10001: linux-2.6-warnings-inline.patch
 Patch10002: linux-2.6-warnings-emptymacros.patch
+Patch10003: linux-2.6-warnings-register.patch
 
 # Xen hypervisor patches (20000+)
 Patch20000: xen-printf-rate-limit.patch
@@ -1331,6 +1332,7 @@
 #%patch10000 -p1
 %patch10001 -p1
 %patch10002 -p1
+%patch10003 -p1
 
 # END OF PATCH APPLICATIONS