diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /include/linux/io.h | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'include/linux/io.h')
| -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 3a03a3604cce..6c7f0ba0d5fa 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, | |||
| 65 | void devm_iounmap(struct device *dev, void __iomem *addr); | 65 | void devm_iounmap(struct device *dev, void __iomem *addr); |
| 66 | int check_signature(const volatile void __iomem *io_addr, | 66 | int check_signature(const volatile void __iomem *io_addr, |
| 67 | const unsigned char *signature, int length); | 67 | const unsigned char *signature, int length); |
| 68 | void devm_ioremap_release(struct device *dev, void *res); | ||
| 68 | 69 | ||
| 69 | #endif /* _LINUX_IO_H */ | 70 | #endif /* _LINUX_IO_H */ |