Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[linux-2.6-omap-h63xx.git] / arch / ppc / platforms / 4xx / ibmnp405h.h

diff --git a/arch/ppc/platforms/4xx/ibmnp405h.h b/arch/ppc/platforms/4xx/ibmnp405h.h
index 2c683f6aaa6699ab81d9113db55f9b7a685b94bf..08a6a779190304cca2f47f5bb6891fb92c580221 100644 (file)
--- a/arch/ppc/platforms/4xx/ibmnp405h.h
+++ b/arch/ppc/platforms/4xx/ibmnp405h.h
@@ -11,7 +11,6 @@
 #ifndef __ASM_IBMNP405H_H__
 #define __ASM_IBMNP405H_H__
 
-#include <linux/config.h>
 
 /* ibm405.h at bottom of this file */
 
@@ -81,7 +80,7 @@
 #define DCRN_CPMFR_BASE        0x0B9
 #define DCRN_CPMER_BASE        0x0B8
 
-/* CPM Clocking & Power Mangement defines */
+/* CPM Clocking & Power Management defines */
 #define IBM_CPM_PCI            0x40000000      /* PCI */
 #define IBM_CPM_EMAC2  0x20000000      /* EMAC 2 MII */
 #define IBM_CPM_EMAC3  0x04000000      /* EMAC 3 MII */