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

« back to all changes in this revision

Viewing changes to drivers/platform/x86/intel_scu_ipc.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:
24
24
#include <linux/pci.h>
25
25
#include <linux/interrupt.h>
26
26
#include <linux/sfi.h>
 
27
#include <linux/module.h>
27
28
#include <asm/mrst.h>
28
29
#include <asm/intel_scu_ipc.h>
29
30
 
725
726
        intel_scu_devices_destroy();
726
727
}
727
728
 
728
 
static const struct pci_device_id pci_ids[] = {
 
729
static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
729
730
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080e)},
730
731
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x082a)},
731
732
        { 0,}