diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /vidix/mga_vid.c | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'vidix/mga_vid.c')
-rw-r--r-- | vidix/mga_vid.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vidix/mga_vid.c b/vidix/mga_vid.c index fd414fa3bb..cd0fe28fd4 100644 --- a/vidix/mga_vid.c +++ b/vidix/mga_vid.c @@ -566,7 +566,8 @@ if(!restore){ } #ifdef MGA_ALLOW_IRQ -static void enable_irq(){ +static void enable_irq(void) +{ long int cc; cc = readl(mga_mmio_base + IEN); @@ -582,7 +583,7 @@ static void enable_irq(){ return; } -static void disable_irq() +static void disable_irq(void) { writeb( 0x11, mga_mmio_base + CRTCX); writeb(0x20, mga_mmio_base + CRTCD ); /* clear 0, enable off */ |