diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 15:48:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 15:48:53 -0700 |
| commit | 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c (patch) | |
| tree | 6afd0fe3aba28ed7137a9b2916a8a6d517ff9c04 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/io.h b/include/linux/io.h index 3a03a3604cc..6c7f0ba0d5f 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -65,5 +65,6 @@ void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset, void devm_iounmap(struct device *dev, void __iomem *addr); int check_signature(const volatile void __iomem *io_addr, const unsigned char *signature, int length); +void devm_ioremap_release(struct device *dev, void *res); #endif /* _LINUX_IO_H */ |