diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/hwmon/asc7621.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/hwmon/asc7621.c')
| -rw-r--r-- | drivers/hwmon/asc7621.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/asc7621.c b/drivers/hwmon/asc7621.c index 89b4f3babe87..d2596cec18b5 100644 --- a/drivers/hwmon/asc7621.c +++ b/drivers/hwmon/asc7621.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
| 29 | 29 | ||
| 30 | /* Addresses to scan */ | 30 | /* Addresses to scan */ |
| 31 | static unsigned short normal_i2c[] = { | 31 | static const unsigned short normal_i2c[] = { |
| 32 | 0x2c, 0x2d, 0x2e, I2C_CLIENT_END | 32 | 0x2c, 0x2d, 0x2e, I2C_CLIENT_END |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| @@ -52,7 +52,7 @@ struct asc7621_chip { | |||
| 52 | u8 company_id; | 52 | u8 company_id; |
| 53 | u8 verstep_reg; | 53 | u8 verstep_reg; |
| 54 | u8 verstep_id; | 54 | u8 verstep_id; |
| 55 | unsigned short *addresses; | 55 | const unsigned short *addresses; |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | static struct asc7621_chip asc7621_chips[] = { | 58 | static struct asc7621_chip asc7621_chips[] = { |