Subject: i2c: normal_i2c can be made const (rtc drivers) Signed-off-by: Jean Delvare Acked-by: Alessandro Zummo --- drivers/rtc/rtc-ds1672.c | 2 +- drivers/rtc/rtc-isl1208.c | 2 +- drivers/rtc/rtc-max6900.c | 2 +- drivers/rtc/rtc-pcf8563.c | 2 +- drivers/rtc/rtc-pcf8583.c | 2 +- drivers/rtc/rtc-x1205.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) --- linux-2.6.24-rc3.orig/drivers/rtc/rtc-ds1672.c 2007-10-10 09:36:45.000000000 +0200 +++ linux-2.6.24-rc3/drivers/rtc/rtc-ds1672.c 2007-11-20 19:47:34.000000000 +0100 @@ -16,7 +16,7 @@ #define DRV_VERSION "0.3" /* Addresses to scan: none. This chip cannot be detected. */ -static unsigned short normal_i2c[] = { I2C_CLIENT_END }; +static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; /* Insmod parameters */ I2C_CLIENT_INSMOD; --- linux-2.6.24-rc3.orig/drivers/rtc/rtc-isl1208.c 2007-02-04 19:44:54.000000000 +0100 +++ linux-2.6.24-rc3/drivers/rtc/rtc-isl1208.c 2007-11-20 19:47:52.000000000 +0100 @@ -61,7 +61,7 @@ /* i2c configuration */ #define ISL1208_I2C_ADDR 0xde -static unsigned short normal_i2c[] = { +static const unsigned short normal_i2c[] = { ISL1208_I2C_ADDR>>1, I2C_CLIENT_END }; I2C_CLIENT_INSMOD; /* defines addr_data */ --- linux-2.6.24-rc3.orig/drivers/rtc/rtc-max6900.c 2007-10-10 09:58:27.000000000 +0200 +++ linux-2.6.24-rc3/drivers/rtc/rtc-max6900.c 2007-11-20 19:47:47.000000000 +0100 @@ -54,7 +54,7 @@ #define MAX6900_I2C_ADDR 0xa0 -static unsigned short normal_i2c[] = { +static const unsigned short normal_i2c[] = { MAX6900_I2C_ADDR >> 1, I2C_CLIENT_END }; --- linux-2.6.24-rc3.orig/drivers/rtc/rtc-pcf8563.c 2007-10-10 09:36:45.000000000 +0200 +++ linux-2.6.24-rc3/drivers/rtc/rtc-pcf8563.c 2007-11-20 19:47:58.000000000 +0100 @@ -25,7 +25,7 @@ * located at 0x51 will pass the validation routine due to * the way the registers are implemented. */ -static unsigned short normal_i2c[] = { I2C_CLIENT_END }; +static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; /* Module parameters */ I2C_CLIENT_INSMOD; --- linux-2.6.24-rc3.orig/drivers/rtc/rtc-pcf8583.c 2007-11-18 23:27:00.000000000 +0100 +++ linux-2.6.24-rc3/drivers/rtc/rtc-pcf8583.c 2007-11-20 19:48:03.000000000 +0100 @@ -40,7 +40,7 @@ struct pcf8583 { #define CTRL_ALARM 0x02 #define CTRL_TIMER 0x01 -static unsigned short normal_i2c[] = { 0x50, I2C_CLIENT_END }; +static const unsigned short normal_i2c[] = { 0x50, I2C_CLIENT_END }; /* Module parameters */ I2C_CLIENT_INSMOD; --- linux-2.6.24-rc3.orig/drivers/rtc/rtc-x1205.c 2007-10-10 09:58:27.000000000 +0200 +++ linux-2.6.24-rc3/drivers/rtc/rtc-x1205.c 2007-11-20 19:48:09.000000000 +0100 @@ -32,7 +32,7 @@ * unknown chips, the user must explicitly set the probe parameter. */ -static unsigned short normal_i2c[] = { I2C_CLIENT_END }; +static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; /* Insmod parameters */ I2C_CLIENT_INSMOD;