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 baf6477165af182450adb1cad6037456676ef416..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;
@@ -75,6 +75,7 @@ struct phy_info {
 struct fs_enet_private {
        struct napi_struct napi;
        struct device *dev;     /* pointer back to the device (must be initialized first) */
+       struct net_device *ndev;
        spinlock_t lock;        /* during all ops except TX pckt processing */
        spinlock_t tx_lock;     /* during fs_start_xmit and fs_tx         */
        struct fs_platform_info *fpi;