Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / net / gianfar_mii.h

diff --git a/drivers/net/gianfar_mii.h b/drivers/net/gianfar_mii.h
index d527cf2f9c1d7f47398eaac003b361e79428b38b..5d3400469514afe0a99f2e38c615ffcf3de97aaa 100644 (file)
--- a/drivers/net/gianfar_mii.h
+++ b/drivers/net/gianfar_mii.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * drivers/net/gianfar_mii.h
  *
  * Gianfar Ethernet Driver -- MII Management Bus Implementation