Fri Nov 6 01:13:50 2015 UTC ()
fix build when XSERVER_PLATFORM_BUS is not defined


(jmcneill)
diff -r1.1.1.1 -r1.2 xsrc/external/mit/xf86-video-modesetting/dist/src/driver.c

cvs diff -r1.1.1.1 -r1.2 xsrc/external/mit/xf86-video-modesetting/dist/src/Attic/driver.c (expand / switch to unified diff)

--- xsrc/external/mit/xf86-video-modesetting/dist/src/Attic/driver.c 2015/11/06 01:11:36 1.1.1.1
+++ xsrc/external/mit/xf86-video-modesetting/dist/src/Attic/driver.c 2015/11/06 01:13:50 1.2
@@ -83,26 +83,30 @@ static Bool ms_driver_func(ScrnInfoPtr s @@ -83,26 +83,30 @@ static Bool ms_driver_func(ScrnInfoPtr s
83 void *data); 83 void *data);
84 84
85#ifdef XSERVER_LIBPCIACCESS 85#ifdef XSERVER_LIBPCIACCESS
86static const struct pci_id_match ms_device_match[] = { 86static const struct pci_id_match ms_device_match[] = {
87 { 87 {
88 PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 88 PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
89 0x00030000, 0x00ff0000, 0 89 0x00030000, 0x00ff0000, 0
90 }, 90 },
91 91
92 { 0, 0, 0 }, 92 { 0, 0, 0 },
93}; 93};
94#endif 94#endif
95 95
 96#ifndef XSERVER_PLATFORM_BUS
 97struct xf86_platform_device;
 98#endif
 99
96#ifdef XSERVER_PLATFORM_BUS 100#ifdef XSERVER_PLATFORM_BUS
97static Bool ms_platform_probe(DriverPtr driver, 101static Bool ms_platform_probe(DriverPtr driver,
98 int entity_num, int flags, struct xf86_platform_device *device, 102 int entity_num, int flags, struct xf86_platform_device *device,
99 intptr_t match_data); 103 intptr_t match_data);
100#endif 104#endif
101 105
102_X_EXPORT DriverRec modesetting = { 106_X_EXPORT DriverRec modesetting = {
103 1, 107 1,
104 "modesetting", 108 "modesetting",
105 Identify, 109 Identify,
106 Probe, 110 Probe,
107 AvailableOptions, 111 AvailableOptions,
108 NULL, 112 NULL,