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/yellowfin.c | |
| parent | f90fdc3cce3d8c8ed09615dc68cb789655078803 (diff) | |
| parent | f71e130966ba429dbd24be08ddbcdf263df9a5ad (diff) | |
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/yellowfin.c')
| -rw-r--r-- | drivers/net/yellowfin.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 1c2506535f7e..75d56bfef0ee 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c @@ -69,8 +69,8 @@ static int fifo_cfg = 0x0020; /* Bypass external Tx FIFO. */ static int dma_ctrl = 0x00CAC277; /* Override when loading module! */ static int fifo_cfg = 0x0028; #else -static int dma_ctrl = 0x004A0263; /* Constrained by errata */ -static int fifo_cfg = 0x0020; /* Bypass external Tx FIFO. */ +static const int dma_ctrl = 0x004A0263; /* Constrained by errata */ +static const int fifo_cfg = 0x0020; /* Bypass external Tx FIFO. */ #endif /* Set the copy breakpoint for the copy-only-tiny-frames scheme. @@ -266,7 +266,7 @@ struct pci_id_info { int drv_flags; /* Driver use, intended as capability flags. */ }; -static struct pci_id_info pci_id_tbl[] = { +static const struct pci_id_info pci_id_tbl[] = { {"Yellowfin G-NIC Gigabit Ethernet", { 0x07021000, 0xffffffff}, PCI_IOTYPE, YELLOWFIN_SIZE, FullTxStatus | IsGigabit | HasMulticastBug | HasMACAddrBug | DontUseEeprom}, |