summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2001-11-06 02:36:26 +0000
committerdes <des@FreeBSD.org>2001-11-06 02:36:26 +0000
commit9e8fe7fac8739d75eb00b55fe3d45e5e3266850d (patch)
treef4c92f6188b97b8d2e04662382d88f9e9bb6a111 /sys
parent9ed45cbd118b37f001d2c609b0cb7b8b34d1ee9f (diff)
downloadFreeBSD-src-9e8fe7fac8739d75eb00b55fe3d45e5e3266850d.zip
FreeBSD-src-9e8fe7fac8739d75eb00b55fe3d45e5e3266850d.tar.gz
syscons' set_border() is now named sc_set_border(), so there is no longer
a naming conflict.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/fb/fbreg.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 1fcaf13..4cf0ad5 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -126,10 +126,8 @@ typedef struct video_switch {
(*vidsw[(adp)->va_index]->get_info)((adp), (mode), (buf))
#define set_video_mode(adp, mode) \
(*vidsw[(adp)->va_index]->set_mode)((adp), (mode))
-#if 0 /* XXX conflicts with syscons' set_border() */
#define set_border(adp, border) \
(*vidsw[(adp)->va_index]->set_border)((adp), (border))
-#endif
#define set_origin(adp, o) \
(*vidsw[(adp)->va_index]->set_win_org)(adp, o)
OpenPOWER on IntegriCloud