diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-07 17:04:23 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-07 17:04:23 +1100 |
commit | 89fa7d4989785694ba720133c0fd3d7485cd059a (patch) | |
tree | ef062d89ed62defaed0856e9e0dff6e130b54aff /include/linux/firmware-map.h | |
parent | e61c0ad53a8281dca1f392a7654e9b1f2210cb91 (diff) | |
parent | f66cce24892aa254a556516339c8307a1a6fd165 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'include/linux/firmware-map.h')
-rw-r--r-- | include/linux/firmware-map.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/firmware-map.h b/include/linux/firmware-map.h index 43fe52fcef0f..71d4fa721db9 100644 --- a/include/linux/firmware-map.h +++ b/include/linux/firmware-map.h @@ -25,6 +25,7 @@ int firmware_map_add_early(u64 start, u64 end, const char *type); int firmware_map_add_hotplug(u64 start, u64 end, const char *type); +int firmware_map_remove(u64 start, u64 end, const char *type); #else /* CONFIG_FIRMWARE_MEMMAP */ @@ -38,6 +39,11 @@ static inline int firmware_map_add_hotplug(u64 start, u64 end, const char *type) return 0; } +static inline int firmware_map_remove(u64 start, u64 end, const char *type) +{ + return 0; +} + #endif /* CONFIG_FIRMWARE_MEMMAP */ #endif /* _LINUX_FIRMWARE_MAP_H */ |