linux-next: manual merge of the driver-core tree with the mfd tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/da9052-core.c between commit 8bad1abd6303 ("mfd: da9052:
Introduce da9052-irq.c") from the mfd tree and commit a9e9ce4c4167 ("mfd:
remove use of __devinitdata") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/mfd/da9052-core.c
index 2153f9bb,689b747..0000000
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@@ -427,7 -447,75 +427,7 @@@ int da9052_adc_read_temp(struct da9052 
  }
  EXPORT_SYMBOL_GPL(da9052_adc_read_temp);
  
- static struct mfd_cell __devinitdata da9052_subdev_info[] = {
 -static struct resource da9052_rtc_resource = {
 -	.name = "ALM",
 -	.start = DA9052_IRQ_ALARM,
 -	.end   = DA9052_IRQ_ALARM,
 -	.flags = IORESOURCE_IRQ,
 -};
 -
 -static struct resource da9052_onkey_resource = {
 -	.name = "ONKEY",
 -	.start = DA9052_IRQ_NONKEY,
 -	.end   = DA9052_IRQ_NONKEY,
 -	.flags = IORESOURCE_IRQ,
 -};
 -
 -static struct resource da9052_bat_resources[] = {
 -	{
 -		.name = "BATT TEMP",
 -		.start = DA9052_IRQ_TBAT,
 -		.end   = DA9052_IRQ_TBAT,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "DCIN DET",
 -		.start = DA9052_IRQ_DCIN,
 -		.end   = DA9052_IRQ_DCIN,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "DCIN REM",
 -		.start = DA9052_IRQ_DCINREM,
 -		.end   = DA9052_IRQ_DCINREM,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "VBUS DET",
 -		.start = DA9052_IRQ_VBUS,
 -		.end   = DA9052_IRQ_VBUS,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "VBUS REM",
 -		.start = DA9052_IRQ_VBUSREM,
 -		.end   = DA9052_IRQ_VBUSREM,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "CHG END",
 -		.start = DA9052_IRQ_CHGEND,
 -		.end   = DA9052_IRQ_CHGEND,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -};
 -
 -static struct resource da9052_tsi_resources[] = {
 -	{
 -		.name = "PENDWN",
 -		.start = DA9052_IRQ_PENDOWN,
 -		.end   = DA9052_IRQ_PENDOWN,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "TSIRDY",
 -		.start = DA9052_IRQ_TSIREADY,
 -		.end   = DA9052_IRQ_TSIREADY,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -};
 -
+ static struct mfd_cell da9052_subdev_info[] = {
  	{
  		.name = "da9052-regulator",
  		.id = 1,

Attachment: pgp00000.pgp
Description: PGP signature