diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:19:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:19:06 -0700 |
| commit | 2513eb8e67a2483aecb5bf7fead7692d5aabbdcd (patch) | |
| tree | 4969e9e0ae8a35553ef985af455e98beb86e2ed4 /kernel/resource.c | |
| parent | d3745f46e32d86de188cf378f923b7a2ed5274f9 (diff) | |
| parent | cd6ef2ada54aa4788d5a3dee3cffaad41383a52a (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 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 129cf046e56..0dd3a857579 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -404,8 +404,6 @@ int insert_resource(struct resource *parent, struct resource *new) return result; } -EXPORT_SYMBOL(insert_resource); - /* * Given an existing resource, change its start and size to match the * arguments. Returns -EBUSY if it can't fit. Existing children of |