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

[linux-2.6-omap-h63xx.git] / drivers / net / ibm_newemac / mal.h

diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h
index cb1a16d589fe780f74df1077ebc486fba93fd22c..784edb8ea8220a285198e16e73c2bd1d67b73c32 100644 (file)
--- a/drivers/net/ibm_newemac/mal.h
+++ b/drivers/net/ibm_newemac/mal.h
@@ -185,7 +185,6 @@ struct mal_commac {
 
 struct mal_instance {
        int                     version;
-       int                     dcr_base;
        dcr_host_t              dcr_host;
 
        int                     num_tx_chans;   /* Number of TX channels */
@@ -213,12 +212,12 @@ struct mal_instance {
 
 static inline u32 get_mal_dcrn(struct mal_instance *mal, int reg)
 {
-       return dcr_read(mal->dcr_host, mal->dcr_base + reg);
+       return dcr_read(mal->dcr_host, reg);
 }
 
 static inline void set_mal_dcrn(struct mal_instance *mal, int reg, u32 val)
 {
-       dcr_write(mal->dcr_host, mal->dcr_base + reg, val);
+       dcr_write(mal->dcr_host, reg, val);
 }
 
 /* Register MAL devices */