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

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

diff --git a/arch/ppc/platforms/4xx/sycamore.c b/arch/ppc/platforms/4xx/sycamore.c
index 281b4a2ffb968ce55a46e2b4d9fc19ba9e9fb51b..8689f3e8ef3a35dd15026713054e2733a1577483 100644 (file)
--- a/arch/ppc/platforms/4xx/sycamore.c
+++ b/arch/ppc/platforms/4xx/sycamore.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/sycamore.c
- *
  * Architecture- / platform-specific boot-time initialization code for
  * IBM PowerPC 4xx based boards.
  *
@@ -11,7 +9,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>
@@ -228,7 +225,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 workaround */
 
 #ifdef DEBUG
        printk("PCI bridge regs after fixup \n");