linux-next: manual merge of the akpm tree with the mips tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/mips/sgi-ip32/ip32-platform.c between commit 2045a53b8e3f ("MIPS:
IP32: ip32-platform is not a module") from the mips tree and commit
8076ee8258d6 ("mips: ip32: add platform data hooks to use DS1685
driver") from the akpm 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 arch/mips/sgi-ip32/ip32-platform.c
index 94191a19588d,ec9eb7f3c628..000000000000
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@@ -97,10 -108,38 +107,34 @@@ static struct resource ip32_rtc_resourc
  	}
  };
  
- static __init int sgio2_cmos_devinit(void)
+ 
+ /* RTC registers on IP32 are each padded by 256 bytes (0x100). */
+ static struct ds1685_rtc_platform_data
+ ip32_rtc_platform_data[] = {
+ 	{
+ 		.regstep = 0x100,
+ 		.bcd_mode = true,
+ 		.no_irq = false,
+ 		.uie_unsupported = false,
+ 		.alloc_io_resources = true,
+ 		.plat_prepare_poweroff = ip32_prepare_poweroff,
+ 	},
+ };
+ 
+ struct platform_device ip32_rtc_device = {
+ 	.name			= "rtc-ds1685",
+ 	.id			= -1,
+ 	.dev			= {
+ 		.platform_data	= ip32_rtc_platform_data,
+ 	},
+ 	.num_resources		= ARRAY_SIZE(ip32_rtc_resources),
+ 	.resource		= ip32_rtc_resources,
+ };
+ 
+ static int __init sgio2_rtc_devinit(void)
  {
- 	return IS_ERR(platform_device_register_simple("rtc_cmos", -1,
- 						      sgio2_cmos_rsrc, 1));
+ 	return platform_device_register(&ip32_rtc_device);
+ 
  }
  
- device_initcall(sgio2_cmos_devinit);
+ device_initcall(sgio2_rtc_devinit);
 -
 -MODULE_AUTHOR("Ralf Baechle <ralf@xxxxxxxxxxxxxx>");
 -MODULE_LICENSE("GPL");
 -MODULE_DESCRIPTION("IP32 platform setup for SGI IP32 aka O2");

Attachment: pgpcyJF1PxKHM.pgp
Description: OpenPGP digital signature