Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / drivers / net / ibm_emac / ibm_emac_mal.h

diff --git a/drivers/net/ibm_emac/ibm_emac_mal.h b/drivers/net/ibm_emac/ibm_emac_mal.h
index f73f10a0a56217c13f378dd5466209f33e2d73d4..b8adbe6d4b015e31145ece21a3470b73f2b818e8 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_mal.h
+++ b/drivers/net/ibm_emac/ibm_emac_mal.h
@@ -24,6 +24,7 @@
 #include <linux/netdevice.h>
 
 #include <asm/io.h>
+#include <asm/dcr.h>
 
 /*
  * These MAL "versions" probably aren't the real versions IBM uses for these 
@@ -190,10 +191,10 @@ struct mal_commac {
 };
 
 struct ibm_ocp_mal {
-       int                     dcrbase;
+       dcr_host_t              dcrhost;
 
        struct list_head        poll_list;
-       struct net_device       poll_dev;
+       struct napi_struct      napi;
 
        struct list_head        list;
        u32                     tx_chan_mask;
@@ -207,12 +208,12 @@ struct ibm_ocp_mal {
 
 static inline u32 get_mal_dcrn(struct ibm_ocp_mal *mal, int reg)
 {
-       return mfdcr(mal->dcrbase + reg);
+       return dcr_read(mal->dcrhost, reg);
 }
 
 static inline void set_mal_dcrn(struct ibm_ocp_mal *mal, int reg, u32 val)
 {
-       mtdcr(mal->dcrbase + reg, val);
+       dcr_write(mal->dcrhost, reg, val);
 }
 
 /* Register MAL devices */
@@ -221,8 +222,7 @@ void mal_exit(void) __exit;
 
 int mal_register_commac(struct ibm_ocp_mal *mal,
                        struct mal_commac *commac) __init;
-void mal_unregister_commac(struct ibm_ocp_mal *mal,
-                          struct mal_commac *commac) __exit;
+void mal_unregister_commac(struct ibm_ocp_mal *mal, struct mal_commac *commac);
 int mal_set_rcbs(struct ibm_ocp_mal *mal, int channel, unsigned long size);
 
 /* Returns BD ring offset for a particular channel