diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:28:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:28:01 -0400 |
| commit | 82aff107f8c9194586f68e86412246629d05670a (patch) | |
| tree | c4336e8bbd453235dafecba6b8dca24c8cbcb2e5 /arch/powerpc/lib/devres.c | |
| parent | d974d905cbfc1039a73ba0c7eea3f4d4e13c0624 (diff) | |
| parent | 208b3a4c196e733b9cec006dc132cfc149b2810a (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
powerpc: Fix hard CPU IDs detection
powerpc/pmac: Update via-pmu to new syscore_ops
powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
powerpc/kvm: Fix kvmppc_core_pending_dec
powerpc: Remove last piece of GEMINI
powerpc: Fix for Pegasos keyboard and mouse
powerpc: Make early memory scan more resilient to out of order nodes
powerpc/pseries/iommu: Cleanup ddw naming
powerpc/pseries/iommu: Find windows after kexec during boot
powerpc/pseries/iommu: Remove ddw property when destroying window
powerpc/pseries/iommu: Add additional checks when changing iommu mask
powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
powerpc: Remove unused/obsolete CONFIG_XICS
misc: Add CARMA DATA-FPGA Programmer support
misc: Add CARMA DATA-FPGA Access Driver
powerpc: Make IRQ_NOREQUEST last to clear, first to set
powerpc: Integrated Flash controller device tree bindings
powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
powerpc/85xx: Fix PCIe IDSEL for Px020RDB
powerpc/85xx: P2020 DTS: re-organize dts files
...
Diffstat (limited to 'arch/powerpc/lib/devres.c')
| -rw-r--r-- | arch/powerpc/lib/devres.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c index deac4d30daf4..e91615abae66 100644 --- a/arch/powerpc/lib/devres.c +++ b/arch/powerpc/lib/devres.c | |||
| @@ -9,11 +9,11 @@ | |||
| 9 | 9 | ||
| 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_flags() */ | 12 | #include <linux/io.h> /* ioremap_prot() */ |
| 13 | #include <linux/module.h> /* EXPORT_SYMBOL() */ | 13 | #include <linux/module.h> /* EXPORT_SYMBOL() */ |
| 14 | 14 | ||
| 15 | /** | 15 | /** |
| 16 | * devm_ioremap_prot - Managed ioremap_flags() | 16 | * devm_ioremap_prot - Managed ioremap_prot() |
| 17 | * @dev: Generic device to remap IO address for | 17 | * @dev: Generic device to remap IO address for |
| 18 | * @offset: BUS offset to map | 18 | * @offset: BUS offset to map |
| 19 | * @size: Size of map | 19 | * @size: Size of map |
| @@ -31,7 +31,7 @@ void __iomem *devm_ioremap_prot(struct device *dev, resource_size_t offset, | |||
| 31 | if (!ptr) | 31 | if (!ptr) |
| 32 | return NULL; | 32 | return NULL; |
| 33 | 33 | ||
| 34 | addr = ioremap_flags(offset, size, flags); | 34 | addr = ioremap_prot(offset, size, flags); |
| 35 | if (addr) { | 35 | if (addr) { |
| 36 | *ptr = addr; | 36 | *ptr = addr; |
| 37 | devres_add(dev, ptr); | 37 | devres_add(dev, ptr); |