diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-05-29 15:50:33 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-05-29 15:50:33 -0400 |
commit | a98d3984c85222aa9efc63c4f9dd3d805ce469f2 (patch) | |
tree | aeb9ebdcc06ca92b8114f30cedf16b8f3780b3f2 /sound/pci/asihpi/hpios.h | |
parent | 52593de4c11fb24c83d8036ba34706881aab5e3d (diff) | |
parent | 55567ab70bd8551c73253e44ea5244db41eac81b (diff) |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/pci/asihpi/hpios.h')
-rw-r--r-- | sound/pci/asihpi/hpios.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/pci/asihpi/hpios.h b/sound/pci/asihpi/hpios.h index a62c3f1e5f09..370f39b43f85 100644 --- a/sound/pci/asihpi/hpios.h +++ b/sound/pci/asihpi/hpios.h | |||
@@ -166,13 +166,4 @@ struct hpi_adapter { | |||
166 | void __iomem *ap_remapped_mem_base[HPI_MAX_ADAPTER_MEM_SPACES]; | 166 | void __iomem *ap_remapped_mem_base[HPI_MAX_ADAPTER_MEM_SPACES]; |
167 | }; | 167 | }; |
168 | 168 | ||
169 | static inline void hpios_unmap_io(void __iomem *addr, | ||
170 | unsigned long size) | ||
171 | { | ||
172 | iounmap(addr); | ||
173 | } | ||
174 | |||
175 | void __iomem *hpios_map_io(struct pci_dev *pci_dev, int idx, | ||
176 | unsigned int length); | ||
177 | |||
178 | #endif | 169 | #endif |