diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /arch/powerpc/lib/devres.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/powerpc/lib/devres.c')
| -rw-r--r-- | arch/powerpc/lib/devres.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c index e91615abae66..8df55fc3aad6 100644 --- a/arch/powerpc/lib/devres.c +++ b/arch/powerpc/lib/devres.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <linux/device.h> /* devres_*(), devm_ioremap_release() */ | 10 | #include <linux/device.h> /* devres_*(), devm_ioremap_release() */ |
| 11 | #include <linux/gfp.h> | 11 | #include <linux/gfp.h> |
| 12 | #include <linux/io.h> /* ioremap_prot() */ | 12 | #include <linux/io.h> /* ioremap_prot() */ |
| 13 | #include <linux/module.h> /* EXPORT_SYMBOL() */ | 13 | #include <linux/export.h> /* EXPORT_SYMBOL() */ |
| 14 | 14 | ||
| 15 | /** | 15 | /** |
| 16 | * devm_ioremap_prot - Managed ioremap_prot() | 16 | * devm_ioremap_prot - Managed ioremap_prot() |