Merge branch 'master' into upstream

[linux-2.6] / arch / ppc / platforms / chestnut.c

diff --git a/arch/ppc/platforms/chestnut.c b/arch/ppc/platforms/chestnut.c
index aefcc0e7be57295a296fe9ace9dd4e171eb0c260..f324f757cae16fe3dda87278f91f31bd5ee22a3d 100644 (file)
--- a/arch/ppc/platforms/chestnut.c
+++ b/arch/ppc/platforms/chestnut.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/chestnut.c
- *
  * Board setup routines for IBM Chestnut
  *
  * Author: <source@mvista.com>