diff options
| author | Erwan Velu <erwan.velu@free.fr> | 2009-04-23 21:23:36 +0200 |
|---|---|---|
| committer | Erwan Velu <erwan.velu@free.fr> | 2009-04-23 21:23:36 +0200 |
| commit | 645398175a19c9d0bade8dc48d20cc9d0d17b4d0 (patch) | |
| tree | 1df6752d6101e2eb97b5dcd202f873e6450fe31d | |
| parent | 75c9aef767d9ab556c92e6e50a0ca0b61b898916 (diff) | |
| download | syslinux-645398175a19c9d0bade8dc48d20cc9d0d17b4d0.tar.gz | |
hdt: fix conflict
Impact: making build working again
A forgoten conflict
| -rw-r--r-- | com32/hdt/hdt-cli-pci.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/com32/hdt/hdt-cli-pci.c b/com32/hdt/hdt-cli-pci.c index 2747b66b..1213c326 100644 --- a/com32/hdt/hdt-cli-pci.c +++ b/com32/hdt/hdt-cli-pci.c @@ -200,7 +200,6 @@ static void show_pci_devices(int argc __unused, char **argv __unused, pci_device->sub_vendor, pci_device->sub_product); -<<<<<<< HEAD:com32/hdt/hdt-cli-pci.c more_printf(first_line); more_printf(second_line); more_printf("\n"); @@ -221,29 +220,6 @@ static void show_pci_devices(int argc __unused, char **argv __unused, } i++; } -======= - more_printf(first_line); - more_printf(second_line); - more_printf("\n"); - } else if (nopciids == true) { - if (nomodulespcimap == true) { - more_printf("%02d: %04x:%04x [%04x:%04x] \n", - i, pci_device->vendor, - pci_device->product, - pci_device->sub_vendor, - pci_device->sub_product); - } else { - more_printf - ("%02d: %04x:%04x [%04x:%04x] Kmod:%s\n", i, - pci_device->vendor, pci_device->product, - pci_device->sub_vendor, - pci_device->sub_product, kernel_modules); - } - } - i++; - } ->>>>>>> 6af3d0ea72a6f6852bda7519278a0c6fdd16d2b5:com32/hdt/hdt-cli-pci.c - } static void show_pci_irq(int argc __unused, char **argv __unused, |