skip to main |
skip to sidebar
=?iso-8859-1?Q?Get_Approved_in_1_Hour ?=
Do You Need Cash?
========================================================================================================================================== On Tue, 2010-01-19 at 06:45 +0100, Pavel Machek wrote: On Thu 2010-01-14 16:24:19, Greg KH wrote: On Fri, Dec 25, 2009 at 09:59:18PM +0100, Pavel Machek wrote: This adds missing include files, so it should now compile. ifdef guards were added to Kconfig, so it should not cause problems on non-arch-msm machines. Signed-off-by: Pavel Machek < pav ... @ucw.cz > Odd, this doesn't apply to the linux-next tree, some of the files are already there. Strange, it seems it is almost all already in. Well, good :-). But there's small problem. linux-next now contains dwalker's tree, and I could not get it to compile, even with staging disabled. I'll need to look into that. I worked on it a little, but I won't have time to really start cleaning up that tree till next week, or this weekend. I pushed a new tree for next that should compile for dream with the attached config. I also included the patch that I added to get it to compile (you'll need the machine types too which I didn't include). Daniel commit cdf6c137865357112aa31666b65b938ab29fa736 Author: Daniel Walker < dwal ... @codeaurora.org > Date: Tue Jan 19 07:08:15 2010 -0800 msm: compile fixes for dream . Signed-off-by: Daniel Walker < dwal ... @codeaurora.org > diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 6d7937f..3f1c74d 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -23,7 +23,6 @@ obj-$(CONFIG_MSM_JTAG_V7) += jtag-v7.o obj-$(CONFIG_ARCH_QSD8X50) += sirc.o obj-$(CONFIG_MSM_FIQ_SUPPORT) += fiq_glue.o -obj-$(CONFIG_MACH_TROUT) += board-trout-rfkill.o obj-$(CONFIG_MSM_SMD) += smd.o obj-$(CONFIG_MSM_SMD_LOGGING) += smem_log.o obj-$(CONFIG_MSM_SMD_TTY) += smd_tty.o @@ -52,11 +51,6 @@ obj-$(CONFIG_MSM_DMA_TEST) += dma_test.o obj-$(CONFIG_SURF_FFA_GPIO_KEYPAD) += keypad-surf-ffa.o obj-$(CONFIG_MACH_TROUT) += board- dream .o -obj-$(CONFIG_ARCH_MSM7X01A) += board-halibut.o -obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o -obj-$(CONFIG_MACH_TROUT) += board-trout-keypad.o board-trout-panel.o -obj-$(CONFIG_MACH_TROUT) += htc_akm_cal.o htc_wifi_nvs.o htc_acoustic.o -obj-$(CONFIG_MACH_TROUT) += board-trout-mmc.o board-trout-wifi.o obj-$(CONFIG_MACH_QSD8X50_SURF) += board-qsd8x50.o obj-$(CONFIG_MACH_QSD8X50_FFA) += board-qsd8x50.o obj-$(CONFIG_MACH_QSD8X50_COMET) += board-comet.o diff --git a/arch/arm/mach-msm/board- dream .c b/arch/arm/mach-msm/board- dream .c index 21afa85..96ac5c2 100644 --- a/arch/arm/mach-msm/board- dream .c +++ b/arch/arm/mach-msm/board- dream .c @@ -34,8 +34,6 @@ static struct platform_device *devices[] __initdata = { &msm_device_uart3, &msm_device_smd, &msm_device_nand, - &msm_device_hsusb, - &msm_device_i2c, }; extern struct sys_timer msm_timer; @@ -78,7 +76,7 @@ static void __init trout_map_io(void) writeb(0x80, TROUT_CPLD_BASE + 0x00);