MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict.

Browse source

Patch 14275ccdb1e4b487cca745aba994699c426a31ee and
d5dedd4507 are conflicting and the
conflict was resolved badly in merge
92241940be501f798cb21db344bbb3d1ec3c4f1c resulting in the BCM1480 changes
of 14275ccdb1e4b487cca745aba994699c426a31ee getting lost.  Sort out the
damage.

Reported and initial patch by Mark Mason <mmason@upwardaccess.com>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

...

This commit is contained in:

Ralf Baechle 2009-09-23 21:37:08 +01:00

parent 9fcd66e572

commit 0863be2e8e

1 changed files with 0 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/mips/sibyte/bcm1480/irq.c

View file