Merge branch 'master' into for-next

[net-next-2.6.git] / drivers / net / ksz884x.c

diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index 7805bbf1d53a6ceeaf02f8c68f4e3740e2c4939d..aa50ee1b02473e282c8834714d77f1ef136ddd09 100644 (file)
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -6812,7 +6812,7 @@ static int stp;
 static int fast_aging;
 
 /**
- * netdev_init - initalize network device.
+ * netdev_init - initialize network device.
  * @dev:       Network device.
  *
  * This function initializes the network device.