Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[linux-2.6-omap-h63xx.git] / arch / ppc / platforms / 4xx / walnut.c

diff --git a/arch/ppc/platforms/4xx/walnut.c b/arch/ppc/platforms/4xx/walnut.c
index 74cb33182d9fac8baf42f6c2a1b5e096c67ffd6e..2f9772340854e2f6f1b02c7018f9f5f1850c6c64 100644 (file)
--- a/arch/ppc/platforms/4xx/walnut.c
+++ b/arch/ppc/platforms/4xx/walnut.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/walnut.c
- *
  * Architecture- / platform-specific boot-time initialization code for
  * IBM PowerPC 4xx based boards. Adapted from original
  * code by Gary Thomas, Cort Dougan <cort@fsmlabs.com>, and Dan Malek
@@ -13,7 +11,6 @@
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/threads.h>
@@ -203,7 +200,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
                    hose->first_busno, PCI_SLOT(hose->first_busno),
                    PCI_FUNC(hose->first_busno), bar, bar_response);
        }
-       /* end work arround */
+       /* end work around */
 
 #ifdef DEBUG
        printk("PCI bridge regs after fixup \n");