Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / atm / iphase.c

diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 729254053758f0d3680ad67f52a32a07865f86b0..d80d51b62a1a4a4cef448696fd36e2665a7b16b4 100644 (file)
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2063,7 +2063,7 @@ static int tx_init(struct atm_dev *dev)
                - UBR Table size is 4K  
                - UBR wait queue is 4K  
           since the table and wait queues are contiguous, all the bytes   
-          can be initialized by one memeset.  
+          can be initialized by one memeset.
        */  
         
         vcsize_sel = 0;
@@ -2089,7 +2089,7 @@ static int tx_init(struct atm_dev *dev)
                - ABR Table size is 2K  
                - ABR wait queue is 2K  
           since the table and wait queues are contiguous, all the bytes   
-          can be intialized by one memeset.  
+          can be initialized by one memeset.
        */  
         i = ABR_SCHED_TABLE * iadev->memSize;
         writew((i >> 11) & 0xffff, iadev->seg_reg+ABR_SBPTR_BASE);