Merge branch 'upstream' into upstream-jgarzik

[mv-sheeva.git] / arch / mips / basler / excite / excite_prom.c

diff --git a/arch/mips/basler/excite/excite_prom.c b/arch/mips/basler/excite/excite_prom.c
index 84724b270753a0f4c40a8b9f26df46052462f9c4..6ecd512b999dee1061b2f1914b5059416041591b 100644 (file)
--- a/arch/mips/basler/excite/excite_prom.c
+++ b/arch/mips/basler/excite/excite_prom.c
@@ -18,7 +18,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/mm.h>