summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorMike Silbersack <silby@FreeBSD.org>2004-03-10 09:02:02 +0000
committerMike Silbersack <silby@FreeBSD.org>2004-03-10 09:02:02 +0000
commit2d5c22cfa8e798a1b03bf25caaf409a501f18988 (patch)
treeb5469683c3ca8743ad158cccb575400d85e2b2e1 /emulators
parentFix up some conflicts issues: there was an edge case where samba-devel (diff)
*Actually* make rtc work on post-502104 -CURRENT.
Notes
Notes: svn path=/head/; revision=103502
Diffstat (limited to 'emulators')
-rw-r--r--emulators/rtc/Makefile2
-rw-r--r--emulators/rtc/files/rtc.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/emulators/rtc/Makefile b/emulators/rtc/Makefile
index c5dac6d48f9a..5b81ce703546 100644
--- a/emulators/rtc/Makefile
+++ b/emulators/rtc/Makefile
@@ -55,9 +55,7 @@ pre-install:
post-install:
${RM} -f ${DEVDIR}/rtc
-.if ${OSVERSION} < 502104
mknod ${DEVDIR}/rtc c ${CDEV_MAJOR} 0
-.endif
${INSTALL_DATA} ${WRKSRC}/rtc.h ${PREFIX}/include/
${MKDIR} ${PREFIX}/share/examples/rtc
${INSTALL_DATA} ${WRKSRC}/test.c ${PREFIX}/share/examples/rtc/
diff --git a/emulators/rtc/files/rtc.c b/emulators/rtc/files/rtc.c
index 1b4a315e15d8..e825602624e8 100644
--- a/emulators/rtc/files/rtc.c
+++ b/emulators/rtc/files/rtc.c
@@ -103,9 +103,7 @@ static struct cdevsw rtc_cdevsw = {
.d_poll = rtc_poll,
.d_read = rtc_read,
.d_name = DEVICE_NAME,
-#if __FreeBSD_version < 502104
.d_maj = CDEV_MAJOR,
-#endif
#else
/* open */ rtc_open,
/* close */ rtc_close,