Module Name: xsrc
Committed By: mrg
Date: Fri Nov 26 21:18:10 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_driver.c
Log Message:
apply some GET_ABI_MAJOR() and avoid compile errors
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.3 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.4
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.3 Wed Nov 24 02:54:09 2010
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c Fri Nov 26 21:18:10 2010
@@ -20,7 +20,7 @@
* 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.
*/
-/* $NetBSD: pnozz_driver.c,v 1.3 2010/11/24 02:54:09 mrg Exp $ */
+/* $NetBSD: pnozz_driver.c,v 1.4 2010/11/26 21:18:10 mrg Exp $ */
/*
* this driver has been tested on SPARCbook 3GX and 3TX, it supports full
@@ -36,7 +36,9 @@
#include "xf86.h"
#include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
+#endif
#include "xf86sbusBus.h"
#include "mipointer.h"
