diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 02:18:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 05:04:32 +0300 |
| commit | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch) | |
| tree | b6b00fd57b24e713e0dc180b64d266b958df7daa /vidix/sysdep/pci_linux.c | |
| parent | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff) | |
| parent | dcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff) | |
| download | mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2 mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz | |
Merge svn changes up to r27092
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
Diffstat (limited to 'vidix/sysdep/pci_linux.c')
| -rw-r--r-- | vidix/sysdep/pci_linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vidix/sysdep/pci_linux.c b/vidix/sysdep/pci_linux.c index a4eb3ebdde..aca99573db 100644 --- a/vidix/sysdep/pci_linux.c +++ b/vidix/sysdep/pci_linux.c @@ -86,7 +86,7 @@ static int pci_get_vendor( { return pci_config_read_long(bus, dev, func, 0); } -#endif +#endif /* CONFIG_SVGAHELPER */ static __inline__ int enable_os_io(void) { @@ -210,4 +210,4 @@ static long pci_config_read_long( } return retval; } -#endif +#endif /* defined(CONFIG_PCI_LINUX_PROC) */ |