diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-21 23:32:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-21 23:32:24 -0700 |
| commit | d3c6e7ad09cebbad1a3dea077668062136626fd2 (patch) | |
| tree | 698022508a8d8c76a5d2cf55e50232079d6b1f42 /include | |
| parent | c3227e546c574172e77616270a16a04eae561b8f (diff) | |
| parent | 48d3ff82698cb0094684aed70446e0a5cbb1a4d0 (diff) | |
| download | linux-3.10-d3c6e7ad09cebbad1a3dea077668062136626fd2.tar.gz linux-3.10-d3c6e7ad09cebbad1a3dea077668062136626fd2.tar.bz2 linux-3.10-d3c6e7ad09cebbad1a3dea077668062136626fd2.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/xt_ipvs.h | 2 | ||||
| -rw-r--r-- | include/linux/pxa168_eth.h | 30 |
2 files changed, 32 insertions, 0 deletions
diff --git a/include/linux/netfilter/xt_ipvs.h b/include/linux/netfilter/xt_ipvs.h index 1167aeb7a34..eff34ac1880 100644 --- a/include/linux/netfilter/xt_ipvs.h +++ b/include/linux/netfilter/xt_ipvs.h @@ -1,6 +1,8 @@ #ifndef _XT_IPVS_H #define _XT_IPVS_H +#include <linux/types.h> + enum { XT_IPVS_IPVS_PROPERTY = 1 << 0, /* all other options imply this one */ XT_IPVS_PROTO = 1 << 1, diff --git a/include/linux/pxa168_eth.h b/include/linux/pxa168_eth.h new file mode 100644 index 00000000000..18d75e79560 --- /dev/null +++ b/include/linux/pxa168_eth.h @@ -0,0 +1,30 @@ +/* + *pxa168 ethernet platform device data definition file. + */ +#ifndef __LINUX_PXA168_ETH_H +#define __LINUX_PXA168_ETH_H + +struct pxa168_eth_platform_data { + int port_number; + int phy_addr; + + /* + * If speed is 0, then speed and duplex are autonegotiated. + */ + int speed; /* 0, SPEED_10, SPEED_100 */ + int duplex; /* DUPLEX_HALF or DUPLEX_FULL */ + + /* + * Override default RX/TX queue sizes if nonzero. + */ + int rx_queue_size; + int tx_queue_size; + + /* + * init callback is used for board specific initialization + * e.g on Aspenite its used to initialize the PHY transceiver. + */ + int (*init)(void); +}; + +#endif /* __LINUX_PXA168_ETH_H */ |