diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/atm/he.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/atm/he.c')
| -rw-r--r-- | drivers/atm/he.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index 3b64a99772e..2e3395b7e8c 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -1,5 +1,3 @@ -/* $Id: he.c,v 1.18 2003/05/06 22:57:15 chas Exp $ */ - /* he.c @@ -99,10 +97,6 @@ #define HPRINTK(fmt,args...) do { } while (0) #endif /* HE_DEBUG */ -/* version definition */ - -static char *version = "$Id: he.c,v 1.18 2003/05/06 22:57:15 chas Exp $"; - /* declarations */ static int he_open(struct atm_vcc *vcc); @@ -366,7 +360,7 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) struct he_dev *he_dev = NULL; int err = 0; - printk(KERN_INFO "he: %s\n", version); + printk(KERN_INFO "ATM he driver\n"); if (pci_enable_device(pci_dev)) return -EIO; @@ -1643,6 +1637,8 @@ he_stop(struct he_dev *he_dev) if (he_dev->rbpl_base) { #ifdef USE_RBPL_POOL + int i; + for (i = 0; i < CONFIG_RBPL_SIZE; ++i) { void *cpuaddr = he_dev->rbpl_virt[i].virt; dma_addr_t dma_handle = he_dev->rbpl_base[i].phys; @@ -1665,6 +1661,8 @@ he_stop(struct he_dev *he_dev) #ifdef USE_RBPS if (he_dev->rbps_base) { #ifdef USE_RBPS_POOL + int i; + for (i = 0; i < CONFIG_RBPS_SIZE; ++i) { void *cpuaddr = he_dev->rbps_virt[i].virt; dma_addr_t dma_handle = he_dev->rbps_base[i].phys; @@ -2933,7 +2931,7 @@ he_proc_read(struct atm_dev *dev, loff_t *pos, char *page) left = *pos; if (!left--) - return sprintf(page, "%s\n", version); + return sprintf(page, "ATM he driver\n"); if (!left--) return sprintf(page, "%s%s\n\n", |