Commit 559595a985e106d2fa9f0c79b7f5805453fed593
Exists in
master
and in
7 other branches
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Run sbc610 USB fixup code only on the appropriate platform.
Showing 1 changed file Side-by-side Diff
arch/powerpc/platforms/86xx/gef_sbc610.c
| ... | ... | @@ -142,6 +142,10 @@ |
| 142 | 142 | { |
| 143 | 143 | unsigned int val; |
| 144 | 144 | |
| 145 | + /* Do not do the fixup on other platforms! */ | |
| 146 | + if (!machine_is(gef_sbc610)) | |
| 147 | + return; | |
| 148 | + | |
| 145 | 149 | printk(KERN_INFO "Running NEC uPD720101 Fixup\n"); |
| 146 | 150 | |
| 147 | 151 | /* Ensure ports 1, 2, 3, 4 & 5 are enabled */ |