linux-next: manual merge of the samsung tree with Linus' and the arm tree
in [Kernel]
|
Prev: [ANNOUNCE] MDB Merkey's Linux Kernel Debugger 2.6.34.2 x86_64 08-10-2010
Next: [ANNOUNCE] MDB Merkey's Linux Kernel Debugger 2.6.35.1 x86_64 08-10-2010
From: Stephen Rothwell on 10 Aug 2010 21:10 Hi Ben, Today's linux-next merge of the samsung tree got a conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c between commits 85b14a3fc4036473ec6776d8e5d92c022155d581 ("ARM: S3C64XX: Add Touchscreen support for S3C64XX") from Linus' tree, 290d0983b86f6243beffaa3ddb02c14adc30f02a ("ARM: S3C64XX: Add keypad device to the SMDK6410 board"), 0ab0b6d226caa4a0268ecbce76a7376c3f40ee6b ("ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410") from the arm tree and commit 96e9d908a7b5b5be774ba26aca0d6633e7c97f63 ("ARM: SMDK6410: Register AC97 controller") from the samsung tree. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c index b5d7861,6878fbd..0000000 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@@ -66,9 -64,7 +66,10 @@@ #include <plat/clock.h> #include <plat/devs.h> #include <plat/cpu.h> +#include <plat/adc.h> +#include <plat/ts.h> +#include <plat/keypad.h> + #include <plat/audio.h> #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB @@@ -282,8 -255,8 +283,9 @@@ static struct platform_device *smdk6410 &s3c_device_fb, &s3c_device_ohci, &s3c_device_usb_hsotg, + &s3c64xx_device_ac97, &s3c64xx_device_iisv4, + &samsung_device_keypad, #ifdef CONFIG_REGULATOR &smdk6410_b_pwr_5v, @@@ -696,8 -654,9 +698,11 @@@ static void __init smdk6410_machine_ini i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0)); i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1)); + s3c_ide_set_platdata(&smdk6410_ide_pdata); + + /* Board defualt with CFG2.1 off */ + s3c64xx_ac97_setup_gpio(S3C64XX_AC97_GPD); + platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices)); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |