← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/misc/carma/carma-fpga-program.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/misc/carma/carma-fpga-program.c
945
945
/* CTL-CPLD Version Register */
946
946
#define CTL_CPLD_VERSION        0x2000
947
947
 
948
 
static int fpga_of_probe(struct platform_device *op,
949
 
                         const struct of_device_id *match)
 
948
static int fpga_of_probe(struct platform_device *op)
950
949
{
951
950
        struct device_node *of_node = op->dev.of_node;
952
951
        struct device *this_device;
1107
1106
        {},
1108
1107
};
1109
1108
 
1110
 
static struct of_platform_driver fpga_of_driver = {
 
1109
static struct platform_driver fpga_of_driver = {
1111
1110
        .probe          = fpga_of_probe,
1112
1111
        .remove         = fpga_of_remove,
1113
1112
        .driver         = {
1124
1123
static int __init fpga_init(void)
1125
1124
{
1126
1125
        led_trigger_register_simple("fpga", &ledtrig_fpga);
1127
 
        return of_register_platform_driver(&fpga_of_driver);
 
1126
        return platform_driver_register(&fpga_of_driver);
1128
1127
}
1129
1128
 
1130
1129
static void __exit fpga_exit(void)
1131
1130
{
1132
 
        of_unregister_platform_driver(&fpga_of_driver);
 
1131
        platform_driver_unregister(&fpga_of_driver);
1133
1132
        led_trigger_unregister_simple(ledtrig_fpga);
1134
1133
}
1135
1134