diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/mmc | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/core/mmc.c | 2 | ||||
-rw-r--r-- | drivers/mmc/core/sd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 06084dbf1277..2fb9d5f271ea 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c | |||
@@ -276,7 +276,7 @@ static struct attribute_group mmc_std_attr_group = { | |||
276 | .attrs = mmc_std_attrs, | 276 | .attrs = mmc_std_attrs, |
277 | }; | 277 | }; |
278 | 278 | ||
279 | static struct attribute_group *mmc_attr_groups[] = { | 279 | static const struct attribute_group *mmc_attr_groups[] = { |
280 | &mmc_std_attr_group, | 280 | &mmc_std_attr_group, |
281 | NULL, | 281 | NULL, |
282 | }; | 282 | }; |
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index cd81c395e164..7ad646fe077e 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c | |||
@@ -314,7 +314,7 @@ static struct attribute_group sd_std_attr_group = { | |||
314 | .attrs = sd_std_attrs, | 314 | .attrs = sd_std_attrs, |
315 | }; | 315 | }; |
316 | 316 | ||
317 | static struct attribute_group *sd_attr_groups[] = { | 317 | static const struct attribute_group *sd_attr_groups[] = { |
318 | &sd_std_attr_group, | 318 | &sd_std_attr_group, |
319 | NULL, | 319 | NULL, |
320 | }; | 320 | }; |