aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-12 21:19:06 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-12 21:19:06 -0700
commit2513eb8e67a2483aecb5bf7fead7692d5aabbdcd (patch)
tree4969e9e0ae8a35553ef985af455e98beb86e2ed4 /include
parentd3745f46e32d86de188cf378f923b7a2ed5274f9 (diff)
parentcd6ef2ada54aa4788d5a3dee3cffaad41383a52a (diff)
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD
* HEAD: [PATCH] The scheduled unexport of insert_resource [PATCH] remove kernel/power/pm.c:pm_unregister_all() [PATCH] Driver core: bus.c cleanups [PATCH] Driver core: kernel-doc in drivers/base/core.c corrections [PATCH] Driver core: fix driver-core kernel-doc
Diffstat (limited to 'include')
-rw-r--r--include/linux/ioport.h2
-rw-r--r--include/linux/pm_legacy.h7
2 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 5612dfeeae5..d42c8339907 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -97,7 +97,7 @@ extern struct resource iomem_resource;
extern int request_resource(struct resource *root, struct resource *new);
extern struct resource * ____request_resource(struct resource *root, struct resource *new);
extern int release_resource(struct resource *new);
-extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new);
+extern int insert_resource(struct resource *parent, struct resource *new);
extern int allocate_resource(struct resource *root, struct resource *new,
resource_size_t size, resource_size_t min,
resource_size_t max, resource_size_t align,
diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h
index 78027c533b9..514729a4468 100644
--- a/include/linux/pm_legacy.h
+++ b/include/linux/pm_legacy.h
@@ -15,11 +15,6 @@ struct pm_dev __deprecated *
pm_register(pm_dev_t type, unsigned long id, pm_callback callback);
/*
- * Unregister all devices with matching callback
- */
-void __deprecated pm_unregister_all(pm_callback callback);
-
-/*
* Send a request to all devices
*/
int __deprecated pm_send_all(pm_request_t rqst, void *data);
@@ -35,8 +30,6 @@ static inline struct pm_dev *pm_register(pm_dev_t type,
return NULL;
}
-static inline void pm_unregister_all(pm_callback callback) {}
-
static inline int pm_send_all(pm_request_t rqst, void *data)
{
return 0;