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

« back to all changes in this revision

Viewing changes to arch/sh/drivers/pci/pci-sh5.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:
107
107
        u32 uval;
108
108
 
109
109
        if (request_irq(IRQ_ERR, pcish5_err_irq,
110
 
                        IRQF_DISABLED, "PCI Error",NULL) < 0) {
 
110
                        0, "PCI Error",NULL) < 0) {
111
111
                printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
112
112
                return -EINVAL;
113
113
        }
114
114
 
115
115
        if (request_irq(IRQ_SERR, pcish5_serr_irq,
116
 
                        IRQF_DISABLED, "PCI SERR interrupt", NULL) < 0) {
 
116
                        0, "PCI SERR interrupt", NULL) < 0) {
117
117
                printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
118
118
                return -EINVAL;
119
119
        }