Merge branch 'master' into upstream

[linux-2.6] / include / asm-frv / irq.h

diff --git a/include/asm-frv/irq.h b/include/asm-frv/irq.h
index 2c16d8dc02fd50fd339508faa6e974b6c8f73996..58b619215a50c7e279a310185911b88c2b40bb02 100644 (file)
--- a/include/asm-frv/irq.h
+++ b/include/asm-frv/irq.h
@@ -12,7 +12,6 @@
 #ifndef _ASM_IRQ_H_
 #define _ASM_IRQ_H_
 
-#include <linux/config.h>
 
 /*
  * the system has an on-CPU PIC and another PIC on the FPGA and other PICs on other peripherals,