Merge branch 'unicore32' of git://github.com/gxt/linux

* 'unicore32' of git://github.com/gxt/linux:
  rtc-puv3: solve section mismatch in rtc-puv3.c
  rtc-puv3: using module_platform_driver()
  i2c-puv3: using module_platform_driver()
  rtc-puv3: irq: remove IRQF_DISABLED
  unicore32: Remove IRQF_DISABLED
  unicore32: Use set_current_blocked()
  unicore32: add ioremap_nocache definition
  unicore32: delete specified xlate_dev_mem_ptr
  of: add include asm/setup.h in drivers/of/fdt.c
  unicore32: standardize /proc/iomem "Kernel code" name
This commit is contained in:
Linus Torvalds 2012-01-10 17:37:20 -08:00
commit c2e08e7ce5
8 changed files with 17 additions and 53 deletions

View file

@ -276,8 +276,6 @@ static int puv3_i2c_resume(struct platform_device *dev)
#define puv3_i2c_resume NULL
#endif
MODULE_ALIAS("platform:puv3_i2c");
static struct platform_driver puv3_i2c_driver = {
.probe = puv3_i2c_probe,
.remove = __devexit_p(puv3_i2c_remove),
@ -289,18 +287,8 @@ static struct platform_driver puv3_i2c_driver = {
}
};
static int __init puv3_i2c_init(void)
{
return platform_driver_register(&puv3_i2c_driver);
}
static void __exit puv3_i2c_exit(void)
{
platform_driver_unregister(&puv3_i2c_driver);
}
module_init(puv3_i2c_init);
module_exit(puv3_i2c_exit);
module_platform_driver(puv3_i2c_driver);
MODULE_DESCRIPTION("PKUnity v3 I2C driver");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:puv3_i2c");