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
/
rrunner.h
diff --git
a/drivers/net/rrunner.h
b/drivers/net/rrunner.h
index
10baae5
..
9f3e050
100644
(file)
--- a/
drivers/net/rrunner.h
+++ b/
drivers/net/rrunner.h
@@
-1,7
+1,6
@@
#ifndef _RRUNNER_H_
#define _RRUNNER_H_
#ifndef _RRUNNER_H_
#define _RRUNNER_H_
-#include <linux/config.h>
#include <linux/interrupt.h>
#if ((BITS_PER_LONG != 32) && (BITS_PER_LONG != 64))
#include <linux/interrupt.h>
#if ((BITS_PER_LONG != 32) && (BITS_PER_LONG != 64))
@@
-168,7
+167,7
@@
struct rr_regs {
/*
* Host control register bits.
*/
/*
* Host control register bits.
*/
-
+
#define RR_INT 0x01
#define RR_CLEAR_INT 0x02
#define NO_SWAP 0x04000004
#define RR_INT 0x01
#define RR_CLEAR_INT 0x02
#define NO_SWAP 0x04000004
@@
-239,9
+238,9
@@
struct rr_regs {
/*
* Receive state
*
/*
* Receive state
*
- * RoadRunner HIPPI Receive State Register controls and monitors the
+ * RoadRunner HIPPI Receive State Register controls and monitors the
* HIPPI receive interface in the NIC. Look at err bits when a HIPPI
* HIPPI receive interface in the NIC. Look at err bits when a HIPPI
- * receive Error Event occurs.
+ * receive Error Event occurs.
*/
#define ENABLE_NEW_CON 0x01
*/
#define ENABLE_NEW_CON 0x01
@@
-701,7
+700,7
@@
struct rr_stats {
u32 StatUpdtT;
u32 StatUpdtC;
u32 WatchDog;
u32 StatUpdtT;
u32 StatUpdtC;
u32 WatchDog;
- u32 Trace;
+ u32 Trace;
/* Serial HIPPI */
u32 LnkRdyEst;
/* Serial HIPPI */
u32 LnkRdyEst;
@@
-830,7
+829,7
@@
struct rr_private
*/
static int rr_init(struct net_device *dev);
static int rr_init1(struct net_device *dev);
*/
static int rr_init(struct net_device *dev);
static int rr_init1(struct net_device *dev);
-static irqreturn_t rr_interrupt(int irq, void *dev_id
, struct pt_regs *regs
);
+static irqreturn_t rr_interrupt(int irq, void *dev_id);
static int rr_open(struct net_device *dev);
static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev);
static int rr_open(struct net_device *dev);
static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev);