diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:43:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:43:39 -0700 |
| commit | 4d7de66e2cc508761f050d1d4eaca88a6e6f711e (patch) | |
| tree | 6b9943c1fc07de4420f95fa935e470760545780c /include/linux | |
| parent | e93adf1e6554511a6194f4785fd29af8e41104db (diff) | |
| parent | a4f1bac62564049ea4718c4624b0fadc9f597c84 (diff) | |
| download | linux-3.10-4d7de66e2cc508761f050d1d4eaca88a6e6f711e.tar.gz linux-3.10-4d7de66e2cc508761f050d1d4eaca88a6e6f711e.tar.bz2 linux-3.10-4d7de66e2cc508761f050d1d4eaca88a6e6f711e.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_conntrack.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h index f8da7ddeff3..08fe5f7d14a 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack.h +++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -239,7 +239,7 @@ ip_conntrack_get(const struct sk_buff *skb, enum ip_conntrack_info *ctinfo) } /* decrement reference count on a conntrack */ -extern inline void ip_conntrack_put(struct ip_conntrack *ct); +extern void ip_conntrack_put(struct ip_conntrack *ct); /* call to create an explicit dependency on ip_conntrack. */ extern void need_ip_conntrack(void); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 41aa32b2869..d2ad2c4f835 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2107,6 +2107,8 @@ #define PCI_DEVICE_ID_TIGON3_5721 0x1659 #define PCI_DEVICE_ID_TIGON3_5705M 0x165d #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e +#define PCI_DEVICE_ID_TIGON3_5780 0x166a +#define PCI_DEVICE_ID_TIGON3_5780S 0x166b #define PCI_DEVICE_ID_TIGON3_5705F 0x166e #define PCI_DEVICE_ID_TIGON3_5750 0x1676 #define PCI_DEVICE_ID_TIGON3_5751 0x1677 |