diff options
| author | Eric Anholt <eric@anholt.net> | 2010-02-19 12:27:55 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-02-20 12:55:13 -0500 |
| commit | 6d48b26098691d772a8de001c89a05b2442ef3b5 (patch) | |
| tree | 6a312b31af04989b03675649a802a39fa3134973 | |
| parent | 4126f73051aa73defcf342c81aa0fc9062f83f90 (diff) | |
Remove dead i830_display.h.
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/i830_display.h | 42 | ||||
| -rw-r--r-- | src/i830_driver.c | 1 |
3 files changed, 1 insertions, 45 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index eb81b48d..04bb95cc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -92,8 +92,7 @@ intel_drv_la_SOURCES = \ EXTRA_DIST = \ $(XMODE_SRCS) \ $(INTEL_DRI_SRCS) \ - $(INTEL_XVMC_SRCS) \ - i830_display.h + $(INTEL_XVMC_SRCS) if DRI intel_drv_la_SOURCES += \ diff --git a/src/i830_display.h b/src/i830_display.h deleted file mode 100644 index d8961f09..00000000 --- a/src/i830_display.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright © 2006 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * Authors: - * Eric Anholt <eric@anholt.net> - * - */ - -#include "xorgVersion.h" - -/* i830_display.c */ -void i830PipeSetBase(xf86CrtcPtr crtc, int x, int y); -void i830WaitForVblank(ScrnInfoPtr scrn); -void i830DescribeOutputConfiguration(ScrnInfoPtr scrn); -void i830_set_new_crtc_bo(ScrnInfoPtr scrn); - -xf86CrtcPtr i830GetLoadDetectPipe(xf86OutputPtr output, DisplayModePtr mode, - int *dpms_mode); -void i830ReleaseLoadDetectPipe(xf86OutputPtr output, int dpms_mode); -void i830_crtc_init(ScrnInfoPtr scrn, int pipe); -DisplayModePtr i830_crtc_mode_get(ScrnInfoPtr scrn, xf86CrtcPtr crtc); -void i830_output_prepare(xf86OutputPtr output); -void i830_output_commit(xf86OutputPtr output); diff --git a/src/i830_driver.c b/src/i830_driver.c index 5582409e..2403a5a2 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -67,7 +67,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/extensions/Xv.h> #include "shadow.h" #include "i830.h" -#include "i830_display.h" #include "i830_video.h" #if HAVE_SYS_MMAN_H && HAVE_MPROTECT #include <sys/mman.h> |