Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / et131x / et131x_initpci.c

diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index 47baab3e6ea8417d8340a23d892a202c9fde6a54..10bcb45d73a38e8d70a5b72da76b80746ae76922 100644 (file)
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -726,7 +726,7 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
        /* Initialize link state */
        et131x_link_detection_handler((unsigned long)adapter);
 
-       /* Intialize variable for counting how long we do not have
+       /* Initialize variable for counting how long we do not have
                                                        link status */
        adapter->PoMgmt.TransPhyComaModeOnBoot = 0;