diff options
author | Jochen Friedrich <jochen@scram.de> | 2008-01-25 09:31:42 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 09:31:05 -0500 |
commit | b5677d848cbb94220ac2cfd36d93bcdbe49c3280 (patch) | |
tree | 608c92fa1b90b5d0918c66402aacc66c0b813d81 /drivers/net/fs_enet | |
parent | 02753cb608cc2c35dbe670b466eb3b88d063b42e (diff) |
[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c
Rename commproc.[ch] to cpm1.[ch] to be more consistent with cpm2. Also
rename cpm2_common.c to cpm2.c as suggested by Scott Wood. Adjust the
includes accordingly.
Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/net/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/fs_enet.h | 2 | ||||
-rw-r--r-- | drivers/net/fs_enet/mac-fec.c | 2 | ||||
-rw-r--r-- | drivers/net/fs_enet/mac-scc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h index c675e29aadcc..e05389c49bbb 100644 --- a/drivers/net/fs_enet/fs_enet.h +++ b/drivers/net/fs_enet/fs_enet.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <asm/fs_pd.h> | 12 | #include <asm/fs_pd.h> |
13 | 13 | ||
14 | #ifdef CONFIG_CPM1 | 14 | #ifdef CONFIG_CPM1 |
15 | #include <asm/commproc.h> | 15 | #include <asm/cpm1.h> |
16 | 16 | ||
17 | struct fec_info { | 17 | struct fec_info { |
18 | fec_t __iomem *fecp; | 18 | fec_t __iomem *fecp; |
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c index c1fee48517e3..8a311d1e435b 100644 --- a/drivers/net/fs_enet/mac-fec.c +++ b/drivers/net/fs_enet/mac-fec.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/8xx_immap.h> | 40 | #include <asm/8xx_immap.h> |
41 | #include <asm/pgtable.h> | 41 | #include <asm/pgtable.h> |
42 | #include <asm/mpc8xx.h> | 42 | #include <asm/mpc8xx.h> |
43 | #include <asm/commproc.h> | 43 | #include <asm/cpm1.h> |
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | #ifdef CONFIG_PPC_CPM_NEW_BINDING | 46 | #ifdef CONFIG_PPC_CPM_NEW_BINDING |
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index fe3d8a621c33..d7ca31945c82 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/8xx_immap.h> | 40 | #include <asm/8xx_immap.h> |
41 | #include <asm/pgtable.h> | 41 | #include <asm/pgtable.h> |
42 | #include <asm/mpc8xx.h> | 42 | #include <asm/mpc8xx.h> |
43 | #include <asm/commproc.h> | 43 | #include <asm/cpm1.h> |
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | #ifdef CONFIG_PPC_CPM_NEW_BINDING | 46 | #ifdef CONFIG_PPC_CPM_NEW_BINDING |