diff --git a/sys/conf/files b/sys/conf/files
index c7c90cdbc5b3..ca3092fbcd6f 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1152 2015/12/09 18:25:32 maxv Exp $
+#	$NetBSD: files,v 1.1153 2016/02/24 22:04:15 skrll Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20150846
@@ -1146,6 +1146,9 @@ define drm {}
 include "external/bsd/drm/conf/files.drm"
 include "dev/drm/files.drm"
 
+# Linux API support
+include "external/bsd/common/conf/files.linux"
+
 # DRM/KMS - Newer direct rendering manager with kernel mode-switching
 include "external/bsd/drm2/drm/files.drmkms"
 
diff --git a/sys/external/bsd/drm2/include/linux/workqueue.h b/sys/external/bsd/common/include/linux/workqueue.h
similarity index 98%
rename from sys/external/bsd/drm2/include/linux/workqueue.h
rename to sys/external/bsd/common/include/linux/workqueue.h
index 51796af3d2db..5490ed763a04 100644
--- a/sys/external/bsd/drm2/include/linux/workqueue.h
+++ b/sys/external/bsd/common/include/linux/workqueue.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: workqueue.h,v 1.4 2014/07/16 20:59:58 riastradh Exp $	*/
+/*	$NetBSD: workqueue.h,v 1.1 2016/02/24 22:04:15 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
diff --git a/sys/external/bsd/drm2/linux/linux_work.c b/sys/external/bsd/common/linux/linux_work.c
similarity index 99%
rename from sys/external/bsd/drm2/linux/linux_work.c
rename to sys/external/bsd/common/linux/linux_work.c
index 9b4f60ab1c3f..79189bb9b0fc 100644
--- a/sys/external/bsd/drm2/linux/linux_work.c
+++ b/sys/external/bsd/common/linux/linux_work.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_work.c,v 1.12 2015/11/15 22:56:24 jakllsch Exp $	*/
+/*	$NetBSD: linux_work.c,v 1.1 2016/02/24 22:04:15 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.12 2015/11/15 22:56:24 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.1 2016/02/24 22:04:15 skrll Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/external/bsd/drm2/drm/files.drmkms b/sys/external/bsd/drm2/drm/files.drmkms
index a331bf0affd1..11b4cb31d797 100644
--- a/sys/external/bsd/drm2/drm/files.drmkms
+++ b/sys/external/bsd/drm2/drm/files.drmkms
@@ -1,4 +1,4 @@
-#	$NetBSD: files.drmkms,v 1.12 2015/08/20 21:41:12 skrll Exp $
+#	$NetBSD: files.drmkms,v 1.13 2016/02/24 22:04:15 skrll Exp $
 
 include "external/bsd/drm2/linux/files.drmkms_linux"
 
@@ -8,7 +8,7 @@ include "external/bsd/drm2/linux/files.drmkms_linux"
 # ARM SoC graphics drivers.
 define	drmkms_i2c: drmkms_linux
 
-define	drmkms: drmkms_linux, drmkms_i2c
+define	drmkms: drmkms_linux, drmkms_i2c, linux
 
 defflag		opt_drmkms.h	DRMKMS_DEBUG
 makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include"
diff --git a/sys/external/bsd/drm2/linux/files.drmkms_linux b/sys/external/bsd/drm2/linux/files.drmkms_linux
index ca7351e54174..261f82bc8947 100644
--- a/sys/external/bsd/drm2/linux/files.drmkms_linux
+++ b/sys/external/bsd/drm2/linux/files.drmkms_linux
@@ -1,4 +1,4 @@
-#       $NetBSD: files.drmkms_linux,v 1.8 2015/01/08 23:35:47 riastradh Exp $
+#       $NetBSD: files.drmkms_linux,v 1.9 2016/02/24 22:04:15 skrll Exp $
 
 define	drmkms_linux: i2cexec, i2c_bitbang
 
@@ -11,6 +11,5 @@ file	external/bsd/drm2/linux/linux_i2c.c		drmkms_linux
 file	external/bsd/drm2/linux/linux_idr.c		drmkms_linux
 file	external/bsd/drm2/linux/linux_list_sort.c	drmkms_linux
 file	external/bsd/drm2/linux/linux_module.c		drmkms_linux
-file	external/bsd/drm2/linux/linux_work.c		drmkms_linux
 file	external/bsd/drm2/linux/linux_writecomb.c	drmkms_linux
 file	external/bsd/drm2/linux/linux_ww_mutex.c	drmkms_linux
diff --git a/sys/modules/drmkms_linux/Makefile b/sys/modules/drmkms_linux/Makefile
index 834113440dd6..417941a92ab3 100644
--- a/sys/modules/drmkms_linux/Makefile
+++ b/sys/modules/drmkms_linux/Makefile
@@ -1,8 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2015/01/08 23:35:47 riastradh Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/24 22:04:15 skrll Exp $
+
+#
+# At some point this needs to turn into linux.kmod and a proper home for it
+# found.  For now pickup the linux_work.c from the (increasingly poorly
+# named) common area.
+#
 
 .include "../Makefile.inc"
 
 .PATH: ${S}/external/bsd/drm2/linux
+.PATH: ${S}/external/bsd/common/linux
 
 CPPFLAGS+=	-I${S}/external/bsd/common/include
 CPPFLAGS+=	-I${S}/external/bsd/drm2/include