Commit fdfa4630 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.5

into penguin.transmeta.com:/home/torvalds/v2.5/linux
parents 037d5e9d 72823cc6
......@@ -768,7 +768,7 @@ ahc_done_unlock(struct ahc_softc *ahc, unsigned long *flags)
}
static __inline void
ahc_list_lockinit()
ahc_list_lockinit(void)
{
spin_lock_init(&ahc_list_spinlock);
}
......
......@@ -1958,8 +1958,7 @@ write_brdctl(struct ahc_softc *ahc, uint8_t value)
}
static uint8_t
read_brdctl(ahc)
struct ahc_softc *ahc;
read_brdctl(struct ahc_softc *ahc)
{
uint8_t brdctl;
uint8_t value;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment