Thu Mar 5 17:35:56 2015 UTC ()
Add an unused struct dev_pm_ops to <linux/pm.h>.


(riastradh)
diff -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/pm.h
cvs diff -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/pm.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/pm.h 2014/07/16 20:59:58 1.3
+++ src/sys/external/bsd/drm2/include/linux/pm.h 2015/03/05 17:35:56 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pm.h,v 1.3 2014/07/16 20:59:58 riastradh Exp $ */ 1/* $NetBSD: pm.h,v 1.4 2015/03/05 17:35:56 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -35,14 +35,18 @@ @@ -35,14 +35,18 @@
35/* Silly stub for i915_suspend. */ 35/* Silly stub for i915_suspend. */
36 36
37typedef struct { 37typedef struct {
38 int event; 38 int event;
39} pm_message_t; 39} pm_message_t;
40 40
41#define PM_EVENT_PRETHAW 0 41#define PM_EVENT_PRETHAW 0
42#define PM_EVENT_SUSPEND 1 42#define PM_EVENT_SUSPEND 1
43 43
44struct dev_pm_domain { 44struct dev_pm_domain {
45 char dummy; /* XXX */ 45 char dummy; /* XXX */
46}; 46};
47 47
 48struct dev_pm_ops {
 49 int (*resume)(struct device *);
 50};
 51
48#endif /* _LINUX_PM_H_ */ 52#endif /* _LINUX_PM_H_ */