git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.0' into x86/vdso
[pandora-kernel.git]
/
include
/
linux
/
acpi_io.h
diff --git
a/include/linux/acpi_io.h
b/include/linux/acpi_io.h
index
7180013
..
4afd710
100644
(file)
--- a/
include/linux/acpi_io.h
+++ b/
include/linux/acpi_io.h
@@
-10,7
+10,6
@@
static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
return ioremap_cache(phys, size);
}
return ioremap_cache(phys, size);
}
-int acpi_os_map_generic_address(struct acpi_generic_address *addr);
-void acpi_os_unmap_generic_address(struct acpi_generic_address *addr);
+void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
#endif
#endif