summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-01-20 09:20:50 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-01-20 09:20:50 +0000
commit87e295b49e152087fa5e0be1628f1c12439f623f (patch)
tree1bb80fdb6a987c146d25ebc5cf06073cdc7f12cb /sys/dev
parentcb898925317707d3ce5a82e7b8894633fd5f755a (diff)
drm_activate() serves no purpose; ok kettenis
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/drm/drm_drv.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 314d2a5fc61..48a04caeb81 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drm_drv.c,v 1.120 2013/12/21 19:36:42 kettenis Exp $ */
+/* $OpenBSD: drm_drv.c,v 1.121 2014/01/20 09:20:49 deraadt Exp $ */
/*-
* Copyright 2007-2009 Owain G. Ainsworth <oga@openbsd.org>
* Copyright © 2008 Intel Corporation
@@ -63,7 +63,6 @@ int drm_lastclose(struct drm_device *);
void drm_attach(struct device *, struct device *, void *);
int drm_probe(struct device *, void *, void *);
int drm_detach(struct device *, int);
-int drm_activate(struct device *, int);
int drmprint(void *, const char *);
int drmsubmatch(struct device *, void *, void *);
int drm_dequeue_event(struct drm_device *, struct drm_file *, size_t,
@@ -288,20 +287,9 @@ drm_detach(struct device *self, int flags)
return 0;
}
-int
-drm_activate(struct device *self, int act)
-{
- switch (act) {
- case DVACT_DEACTIVATE:
- /* FIXME */
- break;
- }
- return (0);
-}
-
struct cfattach drm_ca = {
sizeof(struct drm_device), drm_probe, drm_attach,
- drm_detach, drm_activate
+ drm_detach
};
struct cfdriver drm_cd = {