Merge branch 'master' into upstream

[powerpc.git] / drivers / net / dgrs_i82596.h

diff --git a/drivers/net/dgrs_i82596.h b/drivers/net/dgrs_i82596.h
index c7a38c1..ac9217a 100644 (file)
--- a/drivers/net/dgrs_i82596.h
+++ b/drivers/net/dgrs_i82596.h
@@ -455,7 +455,7 @@ typedef volatile struct
 /************************************************************************/
 typedef volatile struct
 {
-       ulong           sysbus; 
+       ulong           sysbus;
        ulong           dummy;
        I596_ISCP       *iscpp;
 } I596_SCP;