Index: head/sys/mips/conf/MALTA_COMMON
===================================================================
--- head/sys/mips/conf/MALTA_COMMON	(revision 276775)
+++ head/sys/mips/conf/MALTA_COMMON	(nonexistent)
@@ -1,53 +0,0 @@
-# MALTA_COMMON -- Common kernel config options for MALTA boards
-#
-# $FreeBSD$
-
-options 	YAMON
-
-# Don't build any modules yet.
-makeoptions	MODULES_OVERRIDE=""
-
-options 	TICK_USE_YAMON_FREQ=defined
-#options 	TICK_USE_MALTA_RTC=defined
-
-include		"../malta/std.malta"
-
-hints		"MALTA.hints"		#Default places to look for devices.
-
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-
-options 	DDB
-options 	KDB
-
-options 	SCHED_4BSD		#4BSD scheduler
-options 	INET			#InterNETworking
-options 	NFSCL			#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as /, requires NFSCL
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-
-options 	FFS			#Berkeley Fast Filesystem
-options 	SOFTUPDATES		#Enable FFS soft updates support
-options 	UFS_ACL			#Support for access control lists
-options 	UFS_DIRHASH		#Improve performance on big directories
-options 	ROOTDEVNAME=\"ufs:ada0\"
-
-options 	GEOM_LABEL		# Provides labelization
-options 	GEOM_PART_GPT		# GUID Partition Tables.
-options 	GEOM_RAID		# Soft RAID functionality.
-
-# Debugging for use in -current
-#options 	DEADLKRES		#Enable the deadlock resolver
-options 	INVARIANTS		#Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-#options 	WITNESS			#Enable checks to detect deadlocks and cycles
-#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-
-device		loop
-device		ether
-device		le
-device		miibus
-device		bpf
-device		md
-device		uart
-device		random

Property changes on: head/sys/mips/conf/MALTA_COMMON
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/sys/mips/conf/MALTA
===================================================================
--- head/sys/mips/conf/MALTA	(revision 276775)
+++ head/sys/mips/conf/MALTA	(revision 276776)
@@ -1,11 +1,11 @@
 # MALTA -- Kernel config for MALTA boards
 #
 # $FreeBSD$
  
 ident		MALTA
 
-include		"MALTA_COMMON"
+include		"std.MALTA"
  
 machine		mips mipsel	# Malta supports both, so it isn't in std.malta
  
 makeoptions	KERNLOADADDR=0x80100000
Index: head/sys/mips/conf/MALTA64
===================================================================
--- head/sys/mips/conf/MALTA64	(revision 276775)
+++ head/sys/mips/conf/MALTA64	(revision 276776)
@@ -1,13 +1,13 @@
 # MALTA64 -- 64-bit kernel config for MALTA boards
 #
 # $FreeBSD$
  
 ident		MALTA64
 
-include		"MALTA_COMMON"
+include		"std.MALTA"
  
 machine		mips mips64el	# Malta supports both, so it isn't in std.malta
  
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
  
 makeoptions 	KERNLOADADDR=0xffffffff80100000
Index: head/sys/mips/conf/std.MALTA
===================================================================
--- head/sys/mips/conf/std.MALTA	(nonexistent)
+++ head/sys/mips/conf/std.MALTA	(revision 276776)
@@ -0,0 +1,53 @@
+# MALTA_COMMON -- Common kernel config options for MALTA boards
+#
+# $FreeBSD$
+
+options 	YAMON
+
+# Don't build any modules yet.
+makeoptions	MODULES_OVERRIDE=""
+
+options 	TICK_USE_YAMON_FREQ=defined
+#options 	TICK_USE_MALTA_RTC=defined
+
+include		"../malta/std.malta"
+
+hints		"MALTA.hints"		#Default places to look for devices.
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+
+options 	DDB
+options 	KDB
+
+options 	SCHED_4BSD		#4BSD scheduler
+options 	INET			#InterNETworking
+options 	NFSCL			#Network Filesystem Client
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
+options 	PSEUDOFS		#Pseudo-filesystem framework
+options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+
+options 	FFS			#Berkeley Fast Filesystem
+options 	SOFTUPDATES		#Enable FFS soft updates support
+options 	UFS_ACL			#Support for access control lists
+options 	UFS_DIRHASH		#Improve performance on big directories
+options 	ROOTDEVNAME=\"ufs:ada0\"
+
+options 	GEOM_LABEL		# Provides labelization
+options 	GEOM_PART_GPT		# GUID Partition Tables.
+options 	GEOM_RAID		# Soft RAID functionality.
+
+# Debugging for use in -current
+#options 	DEADLKRES		#Enable the deadlock resolver
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+#options 	WITNESS			#Enable checks to detect deadlocks and cycles
+#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+
+device		loop
+device		ether
+device		le
+device		miibus
+device		bpf
+device		md
+device		uart
+device		random

Property changes on: head/sys/mips/conf/std.MALTA
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property