From 736fd64e1536b96fcfe6a1ff2ecc73e7e757c5e9 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:25:12 -0500 Subject: [PATCH] --- yaml --- r: 347201 b: refs/heads/master c: 5e75e86e6d1561d5ae8e38412f93609475f19ed1 h: refs/heads/master i: 347199: de0d94a5e6d783b6f0c1ef0bcd4485c38c8ae99f v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/bfin-async-flash.c | 2 +- trunk/drivers/mtd/maps/gpio-addr-flash.c | 2 +- trunk/drivers/mtd/maps/lantiq-flash.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 42b43ff3e037..37538abfbe7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 042a190944675bc54790bcf45b8b2c86e68f003b +refs/heads/master: 5e75e86e6d1561d5ae8e38412f93609475f19ed1 diff --git a/trunk/drivers/mtd/maps/bfin-async-flash.c b/trunk/drivers/mtd/maps/bfin-async-flash.c index 658a7d06b5eb..6057c6404289 100644 --- a/trunk/drivers/mtd/maps/bfin-async-flash.c +++ b/trunk/drivers/mtd/maps/bfin-async-flash.c @@ -30,7 +30,7 @@ #include #include -#define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) +#define pr_devinit(fmt, args...) ({ static const char __fmt[] = fmt; printk(__fmt, ## args); }) #define DRIVER_NAME "bfin-async-flash" diff --git a/trunk/drivers/mtd/maps/gpio-addr-flash.c b/trunk/drivers/mtd/maps/gpio-addr-flash.c index 9a6a3e153775..4babe04dda50 100644 --- a/trunk/drivers/mtd/maps/gpio-addr-flash.c +++ b/trunk/drivers/mtd/maps/gpio-addr-flash.c @@ -26,7 +26,7 @@ #include #include -#define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) +#define pr_devinit(fmt, args...) ({ static const char __fmt[] = fmt; printk(__fmt, ## args); }) #define DRIVER_NAME "gpio-addr-flash" #define PFX DRIVER_NAME ": " diff --git a/trunk/drivers/mtd/maps/lantiq-flash.c b/trunk/drivers/mtd/maps/lantiq-flash.c index 58d1f61a70b0..0cf6c73070fd 100644 --- a/trunk/drivers/mtd/maps/lantiq-flash.c +++ b/trunk/drivers/mtd/maps/lantiq-flash.c @@ -45,7 +45,7 @@ struct ltq_mtd { }; static const char ltq_map_name[] = "ltq_nor"; -static const char *ltq_probe_types[] __devinitconst = { +static const char *ltq_probe_types[] = { "cmdlinepart", "ofpart", NULL }; static map_word