diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 17:37:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 17:37:20 -0800 |
| commit | c2e08e7ce5ab25a781197a71c5241742e8c9fdfe (patch) | |
| tree | 70cce0b2f4cb82b1670e987169a7790e8467cf41 /drivers/i2c | |
| parent | 28190145543260c155216b9bd3adf57bee50f8b2 (diff) | |
| parent | b3a0aa3ae1c0889ffe8abb2e326d5c74c7c9c097 (diff) | |
| download | kernel_goldelico_gta04-c2e08e7ce5ab25a781197a71c5241742e8c9fdfe.zip kernel_goldelico_gta04-c2e08e7ce5ab25a781197a71c5241742e8c9fdfe.tar.gz kernel_goldelico_gta04-c2e08e7ce5ab25a781197a71c5241742e8c9fdfe.tar.bz2 | |
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
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-puv3.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c index fac6739..93709fb 100644 --- a/drivers/i2c/busses/i2c-puv3.c +++ b/drivers/i2c/busses/i2c-puv3.c @@ -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"); |