Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / 3c527.c

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 38395df..70705d1 100644 (file)
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -729,14 +729,14 @@ static void mc32_halt_transceiver(struct net_device *dev)
  *     mc32_load_rx_ring       -       load the ring of receive buffers
  *     @dev: 3c527 to build the ring for
  *
- *     This initalises the on-card and driver datastructures to
+ *     This initialises the on-card and driver datastructures to
  *     the point where mc32_start_transceiver() can be called.
  *
  *     The card sets up the receive ring for us. We are required to use the
  *     ring it provides, although the size of the ring is configurable.
  *
  *     We allocate an sk_buff for each ring entry in turn and
- *     initalise its house-keeping info. At the same time, we read
+ *     initialise its house-keeping info. At the same time, we read
  *     each 'next' pointer in our rx_ring array. This reduces slow
  *     shared-memory reads and makes it easy to access predecessor
  *     descriptors.