git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.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
2a2d3b2
..
407d2ac
100644
(file)
--- a/
drivers/net/ibm_emac/ibm_emac_mal.h
+++ b/
drivers/net/ibm_emac/ibm_emac_mal.h
@@
-19,12
+19,12
@@
#ifndef __IBM_EMAC_MAL_H_
#define __IBM_EMAC_MAL_H_
#ifndef __IBM_EMAC_MAL_H_
#define __IBM_EMAC_MAL_H_
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/netdevice.h>
#include <asm/io.h>
#include <linux/init.h>
#include <linux/list.h>
#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
/*
* These MAL "versions" probably aren't the real versions IBM uses for these
@@
-192,6
+192,7
@@
struct mal_commac {
struct ibm_ocp_mal {
int dcrbase;
struct ibm_ocp_mal {
int dcrbase;
+ dcr_host_t dcrhost;
struct list_head poll_list;
struct net_device poll_dev;
struct list_head poll_list;
struct net_device poll_dev;
@@
-208,12
+209,12
@@
struct ibm_ocp_mal {
static inline u32 get_mal_dcrn(struct ibm_ocp_mal *mal, int reg)
{
static inline u32 get_mal_dcrn(struct ibm_ocp_mal *mal, int reg)
{
- return
mfdcr(
mal->dcrbase + reg);
+ return
dcr_read(mal->dcrhost,
mal->dcrbase + reg);
}
static inline void set_mal_dcrn(struct ibm_ocp_mal *mal, int reg, u32 val)
{
}
static inline void set_mal_dcrn(struct ibm_ocp_mal *mal, int reg, u32 val)
{
-
mtdcr(
mal->dcrbase + reg, val);
+
dcr_write(mal->dcrhost,
mal->dcrbase + reg, val);
}
/* Register MAL devices */
}
/* Register MAL devices */