diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-15 16:06:27 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-06-15 16:06:27 +0100 |
| commit | 678c1f3425c0fa7e98795c8e351da77d04652e02 (patch) | |
| tree | c292b3198cc6b1b1b118245e68d1a3fd421b37a2 | |
| parent | 95cbbe999418c72dc407069d31e759d70f49ab16 (diff) | |
make pci chipsets static
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rwxr-xr-x | src/pcidb/parse_pci_ids.pl | 2 | ||||
| -rw-r--r-- | src/radeon.h | 1 | ||||
| -rw-r--r-- | src/radeon_pci_chipset_gen.h | 2 | ||||
| -rw-r--r-- | src/radeon_probe.h | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/src/pcidb/parse_pci_ids.pl b/src/pcidb/parse_pci_ids.pl index d1900a48..72fb4807 100755 --- a/src/pcidb/parse_pci_ids.pl +++ b/src/pcidb/parse_pci_ids.pl @@ -29,7 +29,7 @@ open (RADEONCHIPINFO, ">", $radeonchipinfofile) or die; print RADEONCHIPSET "/* This file is autogenerated please do not edit */\n"; print RADEONCHIPSET "static SymTabRec RADEONChipsets[] = {\n"; print PCICHIPSET "/* This file is autogenerated please do not edit */\n"; -print PCICHIPSET "PciChipsets RADEONPciChipsets[] = {\n"; +print PCICHIPSET "static PciChipsets RADEONPciChipsets[] = {\n"; print PCIDEVICEMATCH "/* This file is autogenerated please do not edit */\n"; print PCIDEVICEMATCH "static const struct pci_id_match radeon_device_match[] = {\n"; print RADEONCHIPINFO "/* This file is autogenerated please do not edit */\n"; diff --git a/src/radeon.h b/src/radeon.h index 3566bba5..21ecfd91 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -53,7 +53,6 @@ /* Exa and Cursor Support */ -#include "vbe.h" #include "xf86Cursor.h" /* DDC support */ diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h index dbf07285..c9f9656f 100644 --- a/src/radeon_pci_chipset_gen.h +++ b/src/radeon_pci_chipset_gen.h @@ -1,5 +1,5 @@ /* This file is autogenerated please do not edit */ -PciChipsets RADEONPciChipsets[] = { +static PciChipsets RADEONPciChipsets[] = { { PCI_CHIP_RV380_3150, PCI_CHIP_RV380_3150, RES_SHARED_VGA }, { PCI_CHIP_RV380_3151, PCI_CHIP_RV380_3151, RES_SHARED_VGA }, { PCI_CHIP_RV380_3152, PCI_CHIP_RV380_3152, RES_SHARED_VGA }, diff --git a/src/radeon_probe.h b/src/radeon_probe.h index 0af45314..db4535ca 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -128,9 +128,6 @@ typedef struct int dri2_info_cnt; } RADEONEntRec, *RADEONEntPtr; -/* radeon_probe.c */ -extern PciChipsets RADEONPciChipsets[]; - /* radeon_driver.c */ #ifdef X_XF86MiscPassMessage extern Bool RADEONHandleMessage(int, const char*, const char*, |