Blackfin arch: fix merge errors during 2.6.26 upgrade

Browse source

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

...

This commit is contained in:

Mike Frysinger 2008-10-08 17:39:02 +08:00 • committed by Bryan Wu

parent 5b04f271fe

commit 7eb2c23f60

1 changed files with 8 additions and 10 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

18

arch/blackfin/Kconfig

View file