diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /arch/sparc/kernel/pci_sabre.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/sparc/kernel/pci_sabre.c')
| -rw-r--r-- | arch/sparc/kernel/pci_sabre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pci_sabre.c b/arch/sparc/kernel/pci_sabre.c index 2857073342d2..948068a083fc 100644 --- a/arch/sparc/kernel/pci_sabre.c +++ b/arch/sparc/kernel/pci_sabre.c | |||
| @@ -581,7 +581,7 @@ out_err: | |||
| 581 | return err; | 581 | return err; |
| 582 | } | 582 | } |
| 583 | 583 | ||
| 584 | static struct of_device_id __initdata sabre_match[] = { | 584 | static const struct of_device_id sabre_match[] = { |
| 585 | { | 585 | { |
| 586 | .name = "pci", | 586 | .name = "pci", |
| 587 | .compatible = "pci108e,a001", | 587 | .compatible = "pci108e,a001", |