summaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-03 22:22:45 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-03 22:22:45 -0500
commit46153552b43675dd4057cd526331b5bd10f39c7d (patch)
tree62b6055ee61e320dc10ea81903abbe2e7553bf4e /drivers/net/s2io.c
parentf90fdc3cce3d8c8ed09615dc68cb789655078803 (diff)
parentf71e130966ba429dbd24be08ddbcdf263df9a5ad (diff)
downloadop-kernel-dev-46153552b43675dd4057cd526331b5bd10f39c7d.zip
op-kernel-dev-46153552b43675dd4057cd526331b5bd10f39c7d.tar.gz
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 0db218c..99ce70d 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)
#define SWITCH_SIGN 0xA5A5A5A5A5A5A5A5ULL
#define END_SIGN 0x0
-static u64 herc_act_dtx_cfg[] = {
+static const u64 herc_act_dtx_cfg[] = {
/* Set address */
0x8000051536750000ULL, 0x80000515367500E0ULL,
/* Write data */
@@ -244,7 +244,7 @@ static u64 herc_act_dtx_cfg[] = {
END_SIGN
};
-static u64 xena_mdio_cfg[] = {
+static const u64 xena_mdio_cfg[] = {
/* Reset PMA PLL */
0xC001010000000000ULL, 0xC0010100000000E0ULL,
0xC0010100008000E4ULL,
@@ -254,7 +254,7 @@ static u64 xena_mdio_cfg[] = {
END_SIGN
};
-static u64 xena_dtx_cfg[] = {
+static const u64 xena_dtx_cfg[] = {
0x8000051500000000ULL, 0x80000515000000E0ULL,
0x80000515D93500E4ULL, 0x8001051500000000ULL,
0x80010515000000E0ULL, 0x80010515001E00E4ULL,
@@ -282,7 +282,7 @@ static u64 xena_dtx_cfg[] = {
* Constants for Fixing the MacAddress problem seen mostly on
* Alpha machines.
*/
-static u64 fix_mac[] = {
+static const u64 fix_mac[] = {
0x0060000000000000ULL, 0x0060600000000000ULL,
0x0040600000000000ULL, 0x0000600000000000ULL,
0x0020600000000000ULL, 0x0060600000000000ULL,
OpenPOWER on IntegriCloud