diff options
| author | Fengguang Wu <fengguang.wu@intel.com> | 2012-10-19 13:56:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 14:07:47 -0700 |
| commit | bac716966094e39c8027428993a57b79f2dd6c97 (patch) | |
| tree | 468a1a1c9ec62272deba7a2213826a1a18f172ff /net/bridge/br_stp.c | |
| parent | bbc2e3ef87851bc5430b2b4cf4ca3a2f29baeda6 (diff) | |
firmware/memmap: avoid type conflicts with the generic memmap_init()
Fix this build error:
drivers/firmware/memmap.c:240:19: error: conflicting types for 'memmap_init'
arch/ia64/include/asm/pgtable.h:565:17: note: previous declaration of 'memmap_init' was here
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Bernhard Walle <bwalle@suse.de>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/bridge/br_stp.c')
0 files changed, 0 insertions, 0 deletions