Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2...

[linux-2.6] / drivers / net / fs_enet / fs_enet.h

diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h
index c675e29aadcc39c9e4e1abf3727a5a3a952064c8..e05389c49bbb141e253bbeed681fe763aec7a2a8 100644 (file)
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/fs_enet/fs_enet.h
@@ -12,7 +12,7 @@
 #include <asm/fs_pd.h>
 
 #ifdef CONFIG_CPM1
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 
 struct fec_info {
        fec_t __iomem *fecp;