diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /drivers/firewire/ohci.c | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'drivers/firewire/ohci.c')
| -rw-r--r-- | drivers/firewire/ohci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 638eea51376b..45912e6e0ac2 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
| @@ -3537,7 +3537,7 @@ static inline void pmac_ohci_on(struct pci_dev *dev) {} | |||
| 3537 | static inline void pmac_ohci_off(struct pci_dev *dev) {} | 3537 | static inline void pmac_ohci_off(struct pci_dev *dev) {} |
| 3538 | #endif /* CONFIG_PPC_PMAC */ | 3538 | #endif /* CONFIG_PPC_PMAC */ |
| 3539 | 3539 | ||
| 3540 | static int __devinit pci_probe(struct pci_dev *dev, | 3540 | static int pci_probe(struct pci_dev *dev, |
| 3541 | const struct pci_device_id *ent) | 3541 | const struct pci_device_id *ent) |
| 3542 | { | 3542 | { |
| 3543 | struct fw_ohci *ohci; | 3543 | struct fw_ohci *ohci; |