ARM: S3C24XX: fix merge conflict

Browse source

Missed some changes during re-sorting this branch.
So fixed it.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

...

This commit is contained in:

Kukjin Kim 2014-05-09 05:51:43 +09:00

parent 2916f9a2c6

commit 34c453ce16

1 changed files with 0 additions and 2 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

2

arch/arm/mach-s3c24xx/Kconfig

View file