svn commit: r282277 - in head/sys: conf dev/atkbdc

[Jung-uk Kim]

Author: jkim
Date: Thu Apr 30 17:49:35 2015
New Revision: 282277
URL: https://svnweb.freebsd.org/changeset/base/282277

Log:
  Remove leftover from r282269.
  
  MFC after:	2 weeks
  X-MFC with:	r282269

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/dev/atkbdc/atkbd.c

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Thu Apr 30 17:43:40 2015	(r282276)
+++ head/sys/conf/files.amd64	Thu Apr 30 17:49:35 2015	(r282277)
@@ -514,10 +514,10 @@ compat/ndis/winx64_wrap.S	optional	ndisa
 libkern/memmove.c		standard
 libkern/memset.c		standard
 #
-# x86 real mode BIOS emulator, required by atkbdc/dpms/pci/vesa
+# x86 real mode BIOS emulator, required by dpms/pci/vesa
 #
-compat/x86bios/x86bios.c	optional x86bios | atkbd | dpms | pci | vesa
-contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | pci | vesa
+compat/x86bios/x86bios.c	optional x86bios | dpms | pci | vesa
+contrib/x86emu/x86emu.c		optional x86bios | dpms | pci | vesa
 #
 # bvm console
 #

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Thu Apr 30 17:43:40 2015	(r282276)
+++ head/sys/conf/files.i386	Thu Apr 30 17:49:35 2015	(r282277)
@@ -525,9 +525,9 @@ i386/xbox/xboxfb.c		optional xboxfb
 dev/fb/boot_font.c		optional xboxfb
 i386/xbox/pic16l.s		optional xbox
 #
-# x86 real mode BIOS support, required by atkbdc/dpms/pci/vesa
+# x86 real mode BIOS support, required by dpms/pci/vesa
 #
-compat/x86bios/x86bios.c	optional x86bios | atkbd | dpms | pci | vesa
+compat/x86bios/x86bios.c	optional x86bios | dpms | pci | vesa
 #
 # bvm console
 #

Modified: head/sys/dev/atkbdc/atkbd.c
==============================================================================
--- head/sys/dev/atkbdc/atkbd.c	Thu Apr 30 17:43:40 2015	(r282276)
+++ head/sys/dev/atkbdc/atkbd.c	Thu Apr 30 17:49:35 2015	(r282277)
@@ -44,17 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#if defined(__i386__) || defined(__amd64__)
-#include <machine/md_var.h>
-#include <machine/psl.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <vm/vm_param.h>
-
-#include <isa/isareg.h>
-#endif /* __i386__ || __amd64__ */
-
 #include <sys/kbio.h>
 #include <dev/kbd/kbdreg.h>
 #include <dev/atkbdc/atkbdreg.h>