git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[pandora-kernel.git]
/
drivers
/
net
/
tulip
/
tulip.h
diff --git
a/drivers/net/tulip/tulip.h
b/drivers/net/tulip/tulip.h
index
25668dd
..
25f25da
100644
(file)
--- a/
drivers/net/tulip/tulip.h
+++ b/
drivers/net/tulip/tulip.h
@@
-44,7
+44,7
@@
struct tulip_chip_table {
int valid_intrs; /* CSR7 interrupt enable settings */
int flags;
void (*media_timer) (unsigned long);
int valid_intrs; /* CSR7 interrupt enable settings */
int flags;
void (*media_timer) (unsigned long);
-
void (*media_task) (void *)
;
+
work_func_t media_task
;
};
};
@@
-392,6
+392,7
@@
struct tulip_private {
int csr12_shadow;
int pad0; /* Used for 8-byte alignment */
struct work_struct media_work;
int csr12_shadow;
int pad0; /* Used for 8-byte alignment */
struct work_struct media_work;
+ struct net_device *dev;
};
};
@@
-406,7
+407,7
@@
struct eeprom_fixup {
/* 21142.c */
extern u16 t21142_csr14[];
/* 21142.c */
extern u16 t21142_csr14[];
-void t21142_media_task(
void *data
);
+void t21142_media_task(
struct work_struct *work
);
void t21142_start_nway(struct net_device *dev);
void t21142_lnk_change(struct net_device *dev, int csr5);
void t21142_start_nway(struct net_device *dev);
void t21142_lnk_change(struct net_device *dev, int csr5);
@@
-424,7
+425,7
@@
int tulip_read_eeprom(struct net_device *dev, int location, int addr_len);
/* interrupt.c */
extern unsigned int tulip_max_interrupt_work;
extern int tulip_rx_copybreak;
/* interrupt.c */
extern unsigned int tulip_max_interrupt_work;
extern int tulip_rx_copybreak;
-irqreturn_t tulip_interrupt(int irq, void *dev_instance
, struct pt_regs *regs
);
+irqreturn_t tulip_interrupt(int irq, void *dev_instance);
int tulip_refill_rx(struct net_device *dev);
#ifdef CONFIG_TULIP_NAPI
int tulip_poll(struct net_device *dev, int *budget);
int tulip_refill_rx(struct net_device *dev);
#ifdef CONFIG_TULIP_NAPI
int tulip_poll(struct net_device *dev, int *budget);
@@
-444,7
+445,7
@@
void pnic_lnk_change(struct net_device *dev, int csr5);
void pnic_timer(unsigned long data);
/* timer.c */
void pnic_timer(unsigned long data);
/* timer.c */
-void tulip_media_task(
void *data
);
+void tulip_media_task(
struct work_struct *work
);
void mxic_timer(unsigned long data);
void comet_timer(unsigned long data);
void mxic_timer(unsigned long data);
void comet_timer(unsigned long data);