diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/fs_enet/fs_enet.h | 1 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm1.h | 3 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm2.h | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h index 92590d8fc24b..569be225cd05 100644 --- a/drivers/net/fs_enet/fs_enet.h +++ b/drivers/net/fs_enet/fs_enet.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/dma-mapping.h> | 9 | #include <linux/dma-mapping.h> |
10 | 10 | ||
11 | #include <linux/fs_enet_pd.h> | 11 | #include <linux/fs_enet_pd.h> |
12 | #include <asm/fs_pd.h> | ||
12 | 13 | ||
13 | #ifdef CONFIG_CPM1 | 14 | #ifdef CONFIG_CPM1 |
14 | #include <asm/commproc.h> | 15 | #include <asm/commproc.h> |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h index 5eb49ea63bfe..a99e45e2b6d8 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h | |||
@@ -20,9 +20,6 @@ | |||
20 | #define SCC3_IRQ (CPM_IRQ_OFFSET + CPMVEC_SCC3) | 20 | #define SCC3_IRQ (CPM_IRQ_OFFSET + CPMVEC_SCC3) |
21 | #define SCC4_IRQ (CPM_IRQ_OFFSET + CPMVEC_SCC4) | 21 | #define SCC4_IRQ (CPM_IRQ_OFFSET + CPMVEC_SCC4) |
22 | 22 | ||
23 | /* the CPM address */ | ||
24 | #define CPM_ADDR IMAP_ADDR | ||
25 | |||
26 | static inline void cpm_set_brg(int brg, int baud) | 23 | static inline void cpm_set_brg(int brg, int baud) |
27 | { | 24 | { |
28 | cpm_setbrg(brg, baud); | 25 | cpm_setbrg(brg, baud); |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h index 4b779111eaf9..1b3219f56c81 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h | |||
@@ -20,9 +20,6 @@ | |||
20 | #define SCC3_IRQ SIU_INT_SCC3 | 20 | #define SCC3_IRQ SIU_INT_SCC3 |
21 | #define SCC4_IRQ SIU_INT_SCC4 | 21 | #define SCC4_IRQ SIU_INT_SCC4 |
22 | 22 | ||
23 | /* the CPM address */ | ||
24 | #define CPM_ADDR CPM_MAP_ADDR | ||
25 | |||
26 | static inline void cpm_set_brg(int brg, int baud) | 23 | static inline void cpm_set_brg(int brg, int baud) |
27 | { | 24 | { |
28 | cpm_setbrg(brg, baud); | 25 | cpm_setbrg(brg, baud); |