diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 22:45:50 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 22:45:50 -0500 |
commit | e8b722f487589a1f60ca27adc695494f188d404e (patch) | |
tree | be3897dceb9b7c0949a8917ab11eea2752375e3b /drivers/firmware/memmap.c | |
parent | 01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff) | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'drivers/firmware/memmap.c')
-rw-r--r-- | drivers/firmware/memmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c index 3bf8ee120d42..261b9aa3f248 100644 --- a/drivers/firmware/memmap.c +++ b/drivers/firmware/memmap.c | |||
@@ -56,9 +56,9 @@ struct memmap_attribute { | |||
56 | ssize_t (*show)(struct firmware_map_entry *entry, char *buf); | 56 | ssize_t (*show)(struct firmware_map_entry *entry, char *buf); |
57 | }; | 57 | }; |
58 | 58 | ||
59 | struct memmap_attribute memmap_start_attr = __ATTR_RO(start); | 59 | static struct memmap_attribute memmap_start_attr = __ATTR_RO(start); |
60 | struct memmap_attribute memmap_end_attr = __ATTR_RO(end); | 60 | static struct memmap_attribute memmap_end_attr = __ATTR_RO(end); |
61 | struct memmap_attribute memmap_type_attr = __ATTR_RO(type); | 61 | static struct memmap_attribute memmap_type_attr = __ATTR_RO(type); |
62 | 62 | ||
63 | /* | 63 | /* |
64 | * These are default attributes that are added for every memmap entry. | 64 | * These are default attributes that are added for every memmap entry. |