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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
gianfar.h
diff --git
a/drivers/net/gianfar.h
b/drivers/net/gianfar.h
index
91eaab3
..
c2f783a
100644
(file)
--- a/
drivers/net/gianfar.h
+++ b/
drivers/net/gianfar.h
@@
-37,6
+37,7
@@
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <linux/mm.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <linux/mm.h>
+#include <linux/fsl_devices.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/irq.h>
@@
-47,7
+48,6
@@
#include <linux/workqueue.h>
#include <linux/ethtool.h>
#include <linux/netdevice.h>
#include <linux/workqueue.h>
#include <linux/ethtool.h>
#include <linux/netdevice.h>
-#include <asm/ocp.h>
#include "gianfar_phy.h"
/* The maximum number of packets to be handled in one call of gfar_poll */
#include "gianfar_phy.h"
/* The maximum number of packets to be handled in one call of gfar_poll */
@@
-510,7
+510,10
@@
struct gfar_private {
unsigned int rxclean;
/* Info structure initialized by board setup code */
unsigned int rxclean;
/* Info structure initialized by board setup code */
- struct ocp_gfar_data *einfo;
+ unsigned int interruptTransmit;
+ unsigned int interruptReceive;
+ unsigned int interruptError;
+ struct gianfar_platform_data *einfo;
struct gfar_mii_info *mii_info;
int oldspeed;
struct gfar_mii_info *mii_info;
int oldspeed;