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/starfire.c | |
parent | f90fdc3cce3d8c8ed09615dc68cb789655078803 (diff) | |
parent | f71e130966ba429dbd24be08ddbcdf263df9a5ad (diff) | |
download | talos-op-linux-46153552b43675dd4057cd526331b5bd10f39c7d.tar.gz talos-op-linux-46153552b43675dd4057cd526331b5bd10f39c7d.zip |
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/starfire.c')
-rw-r--r-- | drivers/net/starfire.c | 4 |
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 = { |