diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 16:13:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 16:13:25 -0700 |
| commit | 9676489866a75fdd56b0d3e40ec7884298bb1338 (patch) | |
| tree | 75cbfb35f4e09ad15b8753191b566d401d86de56 /drivers/net/ixp2000/pm3386.h | |
| parent | 15eb7105a74a0a5d72d006fec2192b0ec692b5cc (diff) | |
| parent | 843a46f423a508b3a443a08baa903c6da02f3297 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6:
sky2: prevent dual port receiver problems
x86_64: Check for bad dma address in b44 1GB DMA workaround
The ixp2000 driver for the enp2611 was developed on a board with
Diffstat (limited to 'drivers/net/ixp2000/pm3386.h')
| -rw-r--r-- | drivers/net/ixp2000/pm3386.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ixp2000/pm3386.h b/drivers/net/ixp2000/pm3386.h index fe92bb056ac..cc4183dca91 100644 --- a/drivers/net/ixp2000/pm3386.h +++ b/drivers/net/ixp2000/pm3386.h @@ -13,6 +13,7 @@ #define __PM3386_H void pm3386_reset(void); +int pm3386_port_count(void); void pm3386_init_port(int port); void pm3386_get_mac(int port, u8 *mac); void pm3386_set_mac(int port, u8 *mac); |