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

« back to all changes in this revision

Viewing changes to drivers/spi/spi-topcliff-pch.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Upstream Kernel Changes
  • Date: 2012-03-27 17:01:30 UTC
  • Revision ID: package-import@ubuntu.com-20120327170130-qrvi60snnxty6ibi
Tags: 3.2.0-1411.14
[ Paolo Pisati ]

* Revert to Ubuntu-3.2.0-1409.12 until we figure out what's wrong with hdmi
  - LP: #963512

[ Upstream Kernel Changes ]

* Revert "Reapply upleveled PMU interrupt patch"
* KBuild: Allow scripts/* to be cross compiled
* LINARO: Use KBUILD_SCRIPTROOT to cross build scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
1717
1717
 
1718
1718
#endif
1719
1719
 
1720
 
static struct pci_driver pch_spi_pcidev_driver = {
 
1720
static struct pci_driver pch_spi_pcidev = {
1721
1721
        .name = "pch_spi",
1722
1722
        .id_table = pch_spi_pcidev_id,
1723
1723
        .probe = pch_spi_probe,
1733
1733
        if (ret)
1734
1734
                return ret;
1735
1735
 
1736
 
        ret = pci_register_driver(&pch_spi_pcidev_driver);
 
1736
        ret = pci_register_driver(&pch_spi_pcidev);
1737
1737
        if (ret)
1738
1738
                return ret;
1739
1739
 
1743
1743
 
1744
1744
static void __exit pch_spi_exit(void)
1745
1745
{
1746
 
        pci_unregister_driver(&pch_spi_pcidev_driver);
 
1746
        pci_unregister_driver(&pch_spi_pcidev);
1747
1747
        platform_driver_unregister(&pch_spi_pd_driver);
1748
1748
}
1749
1749
module_exit(pch_spi_exit);