svn commit: r198108 - projects/ppc64/sys/conf

[Nathan Whitehorn]

Author: nwhitehorn
Date: Thu Oct 15 01:50:50 2009
New Revision: 198108
URL: http://svn.freebsd.org/changeset/base/198108

Log:
  Fix merge.

Modified:
  projects/ppc64/sys/conf/files.powerpc64

Modified: projects/ppc64/sys/conf/files.powerpc64
==============================================================================
--- projects/ppc64/sys/conf/files.powerpc64	Thu Oct 15 00:59:08 2009	(r198107)
+++ projects/ppc64/sys/conf/files.powerpc64	Thu Oct 15 01:50:50 2009	(r198108)
@@ -43,7 +43,6 @@ dev/sound/macio/tumbler.c	optional	snd_a
 dev/syscons/scgfbrndr.c		optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
-dev/syscons/teken/teken.c	optional sc
 dev/uart/uart_cpu_powerpc.c	optional	uart
 kern/syscalls.c			optional	ktr
 libkern/bcmp.c			standard