Fix merge error
[openwrt.git] / target / linux / brcm47xx / patches-2.6.30 / 100-board_support.patch
1 --- a/arch/mips/include/asm/bootinfo.h
2 +++ b/arch/mips/include/asm/bootinfo.h
3 @@ -57,6 +57,12 @@
4 #define MACH_MIKROTIK_RB532 0 /* Mikrotik RouterBoard 532 */
5 #define MACH_MIKROTIK_RB532A 1 /* Mikrotik RouterBoard 532A */
6
7 +/*
8 + * Valid machtype for group Broadcom
9 + */
10 +#define MACH_GROUP_BRCM 23 /* Broadcom */
11 +#define MACH_BCM47XX 1 /* Broadcom BCM47xx */
12 +
13 #define CL_SIZE COMMAND_LINE_SIZE
14
15 extern char *system_type;
16 --- a/include/linux/pci_ids.h
17 +++ b/include/linux/pci_ids.h
18 @@ -2106,6 +2106,7 @@
19 #define PCI_DEVICE_ID_TIGON3_5906M 0x1713
20 #define PCI_DEVICE_ID_BCM4401 0x4401
21 #define PCI_DEVICE_ID_BCM4401B0 0x4402
22 +#define PCI_DEVICE_ID_BCM4713 0x4713
23
24 #define PCI_VENDOR_ID_TOPIC 0x151f
25 #define PCI_DEVICE_ID_TOPIC_TP560 0x0000
This page took 0.042813 seconds and 5 git commands to generate.