summaryrefslogtreecommitdiff
path: root/drivers/net/starfire.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-04 06:22:45 +0300
committerJeff Garzik <jeff@garzik.org>2006-03-04 06:22:45 +0300
commit46153552b43675dd4057cd526331b5bd10f39c7d (patch)
tree62b6055ee61e320dc10ea81903abbe2e7553bf4e /drivers/net/starfire.c
parentf90fdc3cce3d8c8ed09615dc68cb789655078803 (diff)
parentf71e130966ba429dbd24be08ddbcdf263df9a5ad (diff)
downloadlinux-46153552b43675dd4057cd526331b5bd10f39c7d.tar.xz
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/starfire.c')
-rw-r--r--drivers/net/starfire.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index ed5458c45446..35b18057fbdd 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -201,7 +201,7 @@ static int max_interrupt_work = 20;
static int mtu;
/* Maximum number of multicast addresses to filter (vs. rx-all-multicast).
The Starfire has a 512 element hash table based on the Ethernet CRC. */
-static int multicast_filter_limit = 512;
+static const int multicast_filter_limit = 512;
/* Whether to do TCP/UDP checksums in hardware */
static int enable_hw_cksum = 1;
@@ -463,7 +463,7 @@ static struct pci_device_id starfire_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, starfire_pci_tbl);
/* A chip capabilities table, matching the CH_xxx entries in xxx_pci_tbl[] above. */
-static struct chip_info {
+static const struct chip_info {
const char *name;
int drv_flags;
} netdrv_tbl[] __devinitdata = {