summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/mount_ntfs/Makefile4
-rw-r--r--sbin/mount_ntfs/mount_ntfs.86
-rw-r--r--sys/arch/alpha/conf/GENERIC3
3 files changed, 7 insertions, 6 deletions
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 57dcf4acdb2..c02e1c3c85c 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.6 2004/10/11 14:45:33 avsm Exp $
+# $OpenBSD: Makefile,v 1.7 2007/12/09 19:48:55 martin Exp $
-.if (${MACHINE} == "i386" || ${MACHINE} == "amd64")
+.if (${MACHINE} == "alpha" || ${MACHINE} == "amd64" || ${MACHINE} == "i386")
PROG= mount_ntfs
SRCS= mount_ntfs.c getmntopts.c
.else
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 7225b157053..3385c54639b 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_ntfs.8,v 1.9 2007/05/31 19:19:45 jmc Exp $
+.\" $OpenBSD: mount_ntfs.8,v 1.10 2007/12/09 19:48:55 martin Exp $
.\" $NetBSD: mount_ntfs.8,v 1.13 2003/02/14 16:21:48 grant Exp $
.\"
.\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -32,7 +32,7 @@
.\"
.\" Id: mount_ntfs.8,v 1.3 1999/05/04 11:34:33 jkoshy Exp
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: December 9 2007 $
.Dt MOUNT_NTFS 8
.Os
.Sh NAME
@@ -187,7 +187,7 @@ mount_ntfs: /dev/wd0k on /mnt: Invalid argument
make sure that the appropriate partition has the correct entry in the
disk label, particularly that the partition offset is correct.
If the NTFS partition is the first partition on the disk, the
-offset should be '63' on i386 (see
+offset should be '63' (see
.Xr disklabel 8 ) .
.\" .Xr mbrlabel 8
.\" could help you to set up the disk label correctly.
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index d058dfe9a3e..3620711b19a 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.196 2007/10/08 12:56:37 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.197 2007/12/09 19:48:55 martin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -45,6 +45,7 @@ option WSDISPLAY_COMPAT_PCVT # emulate some ioctls; needed for X11
option APERTURE # in-kernel aperture driver for XFree86
option USER_PCICONF # user-space PCI configuration
+#option NTFS # Experimental NTFS support
config bsd swap generic