diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 18:48:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 18:48:53 -0400 |
commit | 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c (patch) | |
tree | 6afd0fe3aba28ed7137a9b2916a8a6d517ff9c04 /lib | |
parent | 17aa7e034416e3080bc57a786d09ba0a4a044561 (diff) | |
parent | 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50 (diff) |
Merge branch 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Assign PDE->data before gluing PDE into /proc tree
[POWERPC] devres: Add devm_ioremap_prot()
[POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex
[POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex
[POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex
Diffstat (limited to 'lib')
-rw-r--r-- | lib/devres.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/devres.c b/lib/devres.c index 26c87c49d776..72c8909006da 100644 --- a/lib/devres.c +++ b/lib/devres.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <linux/io.h> | 2 | #include <linux/io.h> |
3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
4 | 4 | ||
5 | static void devm_ioremap_release(struct device *dev, void *res) | 5 | void devm_ioremap_release(struct device *dev, void *res) |
6 | { | 6 | { |
7 | iounmap(*(void __iomem **)res); | 7 | iounmap(*(void __iomem **)res); |
8 | } | 8 | } |