diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
commit | 46153552b43675dd4057cd526331b5bd10f39c7d (patch) | |
tree | 62b6055ee61e320dc10ea81903abbe2e7553bf4e /drivers/net/s2io.c | |
parent | f90fdc3cce3d8c8ed09615dc68cb789655078803 (diff) | |
parent | f71e130966ba429dbd24be08ddbcdf263df9a5ad (diff) |
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 0db218c2dbeb..99ce70dfe9c8 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -223,7 +223,7 @@ static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid) | |||
223 | #define SWITCH_SIGN 0xA5A5A5A5A5A5A5A5ULL | 223 | #define SWITCH_SIGN 0xA5A5A5A5A5A5A5A5ULL |
224 | #define END_SIGN 0x0 | 224 | #define END_SIGN 0x0 |
225 | 225 | ||
226 | static u64 herc_act_dtx_cfg[] = { | 226 | static const u64 herc_act_dtx_cfg[] = { |
227 | /* Set address */ | 227 | /* Set address */ |
228 | 0x8000051536750000ULL, 0x80000515367500E0ULL, | 228 | 0x8000051536750000ULL, 0x80000515367500E0ULL, |
229 | /* Write data */ | 229 | /* Write data */ |
@@ -244,7 +244,7 @@ static u64 herc_act_dtx_cfg[] = { | |||
244 | END_SIGN | 244 | END_SIGN |
245 | }; | 245 | }; |
246 | 246 | ||
247 | static u64 xena_mdio_cfg[] = { | 247 | static const u64 xena_mdio_cfg[] = { |
248 | /* Reset PMA PLL */ | 248 | /* Reset PMA PLL */ |
249 | 0xC001010000000000ULL, 0xC0010100000000E0ULL, | 249 | 0xC001010000000000ULL, 0xC0010100000000E0ULL, |
250 | 0xC0010100008000E4ULL, | 250 | 0xC0010100008000E4ULL, |
@@ -254,7 +254,7 @@ static u64 xena_mdio_cfg[] = { | |||
254 | END_SIGN | 254 | END_SIGN |
255 | }; | 255 | }; |
256 | 256 | ||
257 | static u64 xena_dtx_cfg[] = { | 257 | static const u64 xena_dtx_cfg[] = { |
258 | 0x8000051500000000ULL, 0x80000515000000E0ULL, | 258 | 0x8000051500000000ULL, 0x80000515000000E0ULL, |
259 | 0x80000515D93500E4ULL, 0x8001051500000000ULL, | 259 | 0x80000515D93500E4ULL, 0x8001051500000000ULL, |
260 | 0x80010515000000E0ULL, 0x80010515001E00E4ULL, | 260 | 0x80010515000000E0ULL, 0x80010515001E00E4ULL, |
@@ -282,7 +282,7 @@ static u64 xena_dtx_cfg[] = { | |||
282 | * Constants for Fixing the MacAddress problem seen mostly on | 282 | * Constants for Fixing the MacAddress problem seen mostly on |
283 | * Alpha machines. | 283 | * Alpha machines. |
284 | */ | 284 | */ |
285 | static u64 fix_mac[] = { | 285 | static const u64 fix_mac[] = { |
286 | 0x0060000000000000ULL, 0x0060600000000000ULL, | 286 | 0x0060000000000000ULL, 0x0060600000000000ULL, |
287 | 0x0040600000000000ULL, 0x0000600000000000ULL, | 287 | 0x0040600000000000ULL, 0x0000600000000000ULL, |
288 | 0x0020600000000000ULL, 0x0060600000000000ULL, | 288 | 0x0020600000000000ULL, 0x0060600000000000ULL, |