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

[linux-2.6-omap-h63xx.git] / drivers / serial / cpm_uart / cpm_uart_cpm1.h

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index 9b5465fb0bbb3a5b330e51e8bad8ec2a2c7e2c13..10eecd6af6d4e913adb7563351131f68525744be 100644 (file)
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -2,7 +2,7 @@
  * linux/drivers/serial/cpm_uart/cpm_uart_cpm1.h
  *
  * Driver for CPM (SCC/SMC) serial ports
- * 
+ *
  * definitions for cpm1
  *
  */
@@ -10,17 +10,7 @@
 #ifndef CPM_UART_CPM1_H
 #define CPM_UART_CPM1_H
 
-#include <asm/commproc.h>
-
-/* defines for IRQs */
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-#define SMC1_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SMC1)
-#define SMC2_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SMC2)
-#define SCC1_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SCC1)
-#define SCC2_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SCC2)
-#define SCC3_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SCC3)
-#define SCC4_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SCC4)
-#endif
+#include <asm/cpm1.h>
 
 static inline void cpm_set_brg(int brg, int baud)
 {