aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-10-27 00:08:46 -0400
committerMike Frysinger <vapier@gentoo.org>2011-01-10 07:18:10 -0500
commita2ce077ab3ea30b61a39038cc8d14119c0b2e90a (patch)
tree16ab55aeae2c66c1bdce9fe55e1e0a1fd0f774c1
parent53ee5826546df6b1a989393f8701d1380a441449 (diff)
Blackfin: drop asm/irq.h include from mach headers
These were only included because of the irq handling of the PLL funcs, and those PLL funcs have been moved out into their own header now. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/mach-bf518/include/mach/cdefBF512.h3
-rw-r--r--arch/blackfin/mach-bf527/include/mach/cdefBF522.h3
-rw-r--r--arch/blackfin/mach-bf533/include/mach/cdefBF532.h3
-rw-r--r--arch/blackfin/mach-bf537/include/mach/cdefBF534.h3
-rw-r--r--arch/blackfin/mach-bf538/include/mach/cdefBF538.h3
-rw-r--r--arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h3
-rw-r--r--arch/blackfin/mach-bf561/include/mach/cdefBF561.h3
7 files changed, 0 insertions, 21 deletions
diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF512.h b/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
index 52a7b7ded88f..b657d37a3402 100644
--- a/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
+++ b/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
@@ -1040,7 +1040,4 @@
1040#define bfin_read_SECURE_STATUS() bfin_read16(SECURE_STATUS) 1040#define bfin_read_SECURE_STATUS() bfin_read16(SECURE_STATUS)
1041#define bfin_write_SECURE_STATUS(val) bfin_write16(SECURE_STATUS, val) 1041#define bfin_write_SECURE_STATUS(val) bfin_write16(SECURE_STATUS, val)
1042 1042
1043/* These need to be last due to the cdef/linux inter-dependencies */
1044#include <asm/irq.h>
1045
1046#endif /* _CDEF_BF512_H */ 1043#endif /* _CDEF_BF512_H */
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
index 493098340630..618dfcdfa91a 100644
--- a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
+++ b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
@@ -1092,7 +1092,4 @@
1092#define bfin_read_NFC_DATA_RD() bfin_read16(NFC_DATA_RD) 1092#define bfin_read_NFC_DATA_RD() bfin_read16(NFC_DATA_RD)
1093#define bfin_write_NFC_DATA_RD(val) bfin_write16(NFC_DATA_RD, val) 1093#define bfin_write_NFC_DATA_RD(val) bfin_write16(NFC_DATA_RD, val)
1094 1094
1095/* These need to be last due to the cdef/linux inter-dependencies */
1096#include <asm/irq.h>
1097
1098#endif /* _CDEF_BF522_H */ 1095#endif /* _CDEF_BF522_H */
diff --git a/arch/blackfin/mach-bf533/include/mach/cdefBF532.h b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h
index 1d304bd3f63a..fd0cbe4df21a 100644
--- a/arch/blackfin/mach-bf533/include/mach/cdefBF532.h
+++ b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h
@@ -679,7 +679,4 @@
679#define bfin_read_PPI_FRAME() bfin_read16(PPI_FRAME) 679#define bfin_read_PPI_FRAME() bfin_read16(PPI_FRAME)
680#define bfin_write_PPI_FRAME(val) bfin_write16(PPI_FRAME,val) 680#define bfin_write_PPI_FRAME(val) bfin_write16(PPI_FRAME,val)
681 681
682/* These need to be last due to the cdef/linux inter-dependencies */
683#include <asm/irq.h>
684
685#endif /* _CDEF_BF532_H */ 682#endif /* _CDEF_BF532_H */
diff --git a/arch/blackfin/mach-bf537/include/mach/cdefBF534.h b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h
index 057b494583d7..563ede907336 100644
--- a/arch/blackfin/mach-bf537/include/mach/cdefBF534.h
+++ b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h
@@ -1733,7 +1733,4 @@
1733#define bfin_read_HMDMA1_BCOUNT() bfin_read16(HMDMA1_BCOUNT) 1733#define bfin_read_HMDMA1_BCOUNT() bfin_read16(HMDMA1_BCOUNT)
1734#define bfin_write_HMDMA1_BCOUNT(val) bfin_write16(HMDMA1_BCOUNT,val) 1734#define bfin_write_HMDMA1_BCOUNT(val) bfin_write16(HMDMA1_BCOUNT,val)
1735 1735
1736/* These need to be last due to the cdef/linux inter-dependencies */
1737#include <asm/irq.h>
1738
1739#endif /* _CDEF_BF534_H */ 1736#endif /* _CDEF_BF534_H */
diff --git a/arch/blackfin/mach-bf538/include/mach/cdefBF538.h b/arch/blackfin/mach-bf538/include/mach/cdefBF538.h
index 7ea870bf9cb8..f6a56792180b 100644
--- a/arch/blackfin/mach-bf538/include/mach/cdefBF538.h
+++ b/arch/blackfin/mach-bf538/include/mach/cdefBF538.h
@@ -1957,7 +1957,4 @@
1957#define bfin_read_CAN_MB31_ID1() bfin_read16(CAN_MB31_ID1) 1957#define bfin_read_CAN_MB31_ID1() bfin_read16(CAN_MB31_ID1)
1958#define bfin_write_CAN_MB31_ID1(val) bfin_write16(CAN_MB31_ID1, val) 1958#define bfin_write_CAN_MB31_ID1(val) bfin_write16(CAN_MB31_ID1, val)
1959 1959
1960/* These need to be last due to the cdef/linux inter-dependencies */
1961#include <asm/irq.h>
1962
1963#endif 1960#endif
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
index 5e7092182af3..50c89c8052f3 100644
--- a/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
+++ b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
@@ -2629,8 +2629,5 @@
2629 2629
2630/* Handshake MDMA is not defined in the shared file because it is not available on the ADSP-BF542 bfin_read_()rocessor */ 2630/* Handshake MDMA is not defined in the shared file because it is not available on the ADSP-BF542 bfin_read_()rocessor */
2631 2631
2632/* These need to be last due to the cdef/linux inter-dependencies */
2633#include <asm/irq.h>
2634
2635#endif /* _CDEF_BF54X_H */ 2632#endif /* _CDEF_BF54X_H */
2636 2633
diff --git a/arch/blackfin/mach-bf561/include/mach/cdefBF561.h b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h
index 549f0fe6edb8..753331597207 100644
--- a/arch/blackfin/mach-bf561/include/mach/cdefBF561.h
+++ b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h
@@ -1457,7 +1457,4 @@
1457#define bfin_read_IMDMA_S1_IRQ_STATUS() bfin_read16(IMDMA_S1_IRQ_STATUS) 1457#define bfin_read_IMDMA_S1_IRQ_STATUS() bfin_read16(IMDMA_S1_IRQ_STATUS)
1458#define bfin_write_IMDMA_S1_IRQ_STATUS(val) bfin_write16(IMDMA_S1_IRQ_STATUS,val) 1458#define bfin_write_IMDMA_S1_IRQ_STATUS(val) bfin_write16(IMDMA_S1_IRQ_STATUS,val)
1459 1459
1460/* These need to be last due to the cdef/linux inter-dependencies */
1461#include <asm/irq.h>
1462
1463#endif /* _CDEF_BF561_H */ 1460#endif /* _CDEF_BF561_H */