diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-06 17:59:47 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-06 17:59:47 +1100 |
commit | 3424e82515bf0781df6fe6e621ce4bdfa4bf4a16 (patch) | |
tree | 1da0c5f1055d557d12b0d766db70bbe83fa200b1 /drivers/atm/iphase.h | |
parent | 71942a3b7471b768b07095731928558fd18a831d (diff) | |
parent | 46c3b4fb248255cf78eb4680802b1ce411bcd87d (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/atm/iphase.h')
-rw-r--r-- | drivers/atm/iphase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h index 53ecac5a2161..2beacf2fc1ec 100644 --- a/drivers/atm/iphase.h +++ b/drivers/atm/iphase.h @@ -21,7 +21,7 @@ supports a variety of varients of Interphase ATM PCI (i)Chip adapter card family (See www.iphase.com/products/ClassSheet.cfm?ClassID=ATM) in terms of PHY type, the size of control memory and the size of - packet memory. The followings are the change log and history: + packet memory. The following are the change log and history: Bugfix the Mona's UBR driver. Modify the basic memory allocation and dma logic. |