From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 3 Dec 2009 21:33:01 +0000 (+0000)
Subject: ARM: Merge next-s3c24xx-dev-rtp
X-Git-Tag: v2.6.33-rc1~340^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f18ea8276bc6b0f8584c442905e9badc2acc8785;p=karo-tx-linux.git

ARM: Merge next-s3c24xx-dev-rtp

Merge branch 'next-s3c24xx-dev-rtp' into for-rmk

Conflicts:

	arch/arm/mach-s3c2440/mach-anubis.c
---

f18ea8276bc6b0f8584c442905e9badc2acc8785
diff --cc arch/arm/mach-s3c2440/mach-anubis.c
index c3705b99d15c,5f5dccf306a8..62a4c3eba97f
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@@ -488,7 -474,8 +486,9 @@@ static void __init anubis_map_io(void
  static void __init anubis_init(void)
  {
  	s3c_i2c0_set_platdata(NULL);
+ 	s3c_nand_set_platdata(&anubis_nand_info);
 +	simtec_audio_add(NULL, false, &anubis_audio);
+ 
  	platform_add_devices(anubis_devices, ARRAY_SIZE(anubis_devices));
  
  	i2c_register_board_info(0, anubis_i2c_devs,