diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2004-02-05 05:21:49 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-02-05 05:21:49 -0500 |
| commit | 11bdba911d8c1ceb9b29d24f02422737f148d6b6 (patch) | |
| tree | f2d0519d7f686ab93cd97424482462932af7afef /include/linux | |
| parent | fe7d979accc61adff8aaa4d3dc113f9a29ea8801 (diff) | |
| parent | 526463f5b9412db19a009403683549b2cd760125 (diff) | |
Merge redhat.com:/spare/repo/netdev-2.6/netdev-alloc-3
into redhat.com:/spare/repo/net-drivers-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 1 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index cfdeaaad2b7e..84b6fd41e2d2 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -496,6 +496,7 @@ extern rwlock_t dev_base_lock; /* Device list lock */ extern int netdev_boot_setup_add(char *name, struct ifmap *map); extern int netdev_boot_setup_check(struct net_device *dev); +extern unsigned long netdev_boot_base(const char *prefix, int unit); extern struct net_device *dev_getbyhwaddr(unsigned short type, char *hwaddr); extern struct net_device *__dev_getfirstbyhwtype(unsigned short type); extern struct net_device *dev_getfirstbyhwtype(unsigned short type); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4dba6ec06e3a..4f32a075a63d 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -633,6 +633,8 @@ #define PCI_DEVICE_ID_HP_TACHLITE 0x1029 #define PCI_DEVICE_ID_HP_J2585A 0x1030 #define PCI_DEVICE_ID_HP_J2585B 0x1031 +#define PCI_DEVICE_ID_HP_J2973A 0x1040 +#define PCI_DEVICE_ID_HP_J2970A 0x1042 #define PCI_DEVICE_ID_HP_DIVA 0x1048 #define PCI_DEVICE_ID_HP_DIVA_TOSCA1 0x1049 #define PCI_DEVICE_ID_HP_DIVA_TOSCA2 0x104A |