diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-03-08 05:46:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-03-08 05:46:55 -0500 |
| commit | e9eb0d84e084e92b6d4997c0364597a9cf296752 (patch) | |
| tree | dd93a2b540d631378ad2bef3df69cbfb8937f57c /include | |
| parent | ec18d37912f3487a35f4481a48377835b1dae583 (diff) | |
| parent | 135522dd8daea8b1614472b1d4dc34b864875aa5 (diff) | |
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/netdev-2.6/janitor
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dp83840.h | 41 | ||||
| -rw-r--r-- | include/net/slhc_vj.h | 3 |
2 files changed, 0 insertions, 44 deletions
diff --git a/include/linux/dp83840.h b/include/linux/dp83840.h deleted file mode 100644 index 1ca8e5754608..000000000000 --- a/include/linux/dp83840.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * linux/dp83840.h: definitions for DP83840 MII-compatible transceivers - * - * Copyright (C) 1996, 1999 David S. Miller (davem@redhat.com) - */ -#ifndef __LINUX_DP83840_H -#define __LINUX_DP83840_H - -#include <linux/mii.h> - -/* - * Data sheets and programming docs for the DP83840 are available at - * from http://www.national.com/ - * - * The DP83840 is capable of both 10 and 100Mbps ethernet, in both - * half and full duplex mode. It also supports auto negotiation. - * - * But.... THIS THING IS A PAIN IN THE ASS TO PROGRAM! - * Debugging eeprom burnt code is more fun than programming this chip! - */ - -/* First, the MII register numbers (actually DP83840 register numbers). */ -#define MII_CSCONFIG 0x17 /* CS configuration */ - -/* The Carrier Sense config register. */ -#define CSCONFIG_RESV1 0x0001 /* Unused... */ -#define CSCONFIG_LED4 0x0002 /* Pin for full-dplx LED4 */ -#define CSCONFIG_LED1 0x0004 /* Pin for conn-status LED1 */ -#define CSCONFIG_RESV2 0x0008 /* Unused... */ -#define CSCONFIG_TCVDISAB 0x0010 /* Turns off the transceiver */ -#define CSCONFIG_DFBYPASS 0x0020 /* Bypass disconnect function */ -#define CSCONFIG_GLFORCE 0x0040 /* Good link force for 100mbps */ -#define CSCONFIG_CLKTRISTATE 0x0080 /* Tristate 25m clock */ -#define CSCONFIG_RESV3 0x0700 /* Unused... */ -#define CSCONFIG_ENCODE 0x0800 /* 1=MLT-3, 0=binary */ -#define CSCONFIG_RENABLE 0x1000 /* Repeater mode enable */ -#define CSCONFIG_TCDISABLE 0x2000 /* Disable timeout counter */ -#define CSCONFIG_RESV4 0x4000 /* Unused... */ -#define CSCONFIG_NDISABLE 0x8000 /* Disable NRZI */ - -#endif /* __LINUX_DP83840_H */ diff --git a/include/net/slhc_vj.h b/include/net/slhc_vj.h index 0a85dc014336..0b2c2784f333 100644 --- a/include/net/slhc_vj.h +++ b/include/net/slhc_vj.h @@ -185,7 +185,4 @@ int slhc_remember __ARGS((struct slcompress *comp, unsigned char *icp, int isize)); int slhc_toss __ARGS((struct slcompress *comp)); -void slhc_i_status __ARGS((struct slcompress *comp)); -void slhc_o_status __ARGS((struct slcompress *comp)); - #endif /* _SLHC_H */ |