Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751238AbVKATzv (ORCPT ); Tue, 1 Nov 2005 14:55:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751242AbVKATzv (ORCPT ); Tue, 1 Nov 2005 14:55:51 -0500 Received: from gprs189-60.eurotel.cz ([160.218.189.60]:19334 "EHLO amd.ucw.cz") by vger.kernel.org with ESMTP id S1751238AbVKATzu (ORCPT ); Tue, 1 Nov 2005 14:55:50 -0500 Date: Tue, 1 Nov 2005 20:31:35 +0100 From: Pavel Machek To: Richard Purdie Cc: LKML Subject: Re: Make spitz compile again Message-ID: <20051101193135.GA7075@elf.ucw.cz> References: <20051031134255.GA8093@elf.ucw.cz> <1130773530.8353.39.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1130773530.8353.39.camel@localhost.localdomain> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3745 Lines: 132 Hi! > > This is what I needed to do after update to latest linus > > kernel. Perhaps it helps someone. > > > > Signed-off-by: Pavel Machek > > > > , but it is against Richard's tree merged into my tree, so do not > > expect to apply it over mainline. Akita code movement is needed if I > > want to compile kernel without akita support... > > This is an update of my tree against 2.6.14-git3: > > http://www.rpsys.net/openzaurus/temp/total-2.6.14-git3-r0.patch.gz I needed this to get it to compile... Please apply (probably modulo // part). Signed-off-by: Pavel Machek Pavel --- clean-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 19:32:56.000000000 +0100 +++ linux-rp/arch/arm/mach-pxa/pxa_keys.c 2005-11-01 20:17:38.000000000 +0100 @@ -55,24 +55,20 @@ } #ifdef CONFIG_PM -static int pxa_keys_suspend(struct device *dev, pm_message_t state, uint32_t level) +static int pxa_keys_suspend(struct device *dev, pm_message_t state) { - if (level == SUSPEND_POWER_DOWN) { - struct pxa_keys_platform_data *k = dev_get_drvdata(dev); - k->suspended = 1; - } + struct pxa_keys_platform_data *k = dev_get_drvdata(dev); + k->suspended = 1; return 0; } -static int pxa_keys_resume(struct device *dev, uint32_t level) +static int pxa_keys_resume(struct device *dev) { - if (level == RESUME_POWER_ON) { - struct pxa_keys_platform_data *k = dev_get_drvdata(dev); + struct pxa_keys_platform_data *k = dev_get_drvdata(dev); - /* Upon resume, ignore the suspend key for a short while */ - k->suspend_jiffies=jiffies; - k->suspended = 0; - } + /* Upon resume, ignore the suspend key for a short while */ + k->suspend_jiffies=jiffies; + k->suspended = 0; return 0; } #else --- clean-rp/arch/arm/mach-pxa/spitz.c 2005-11-01 19:32:56.000000000 +0100 +++ linux-rp/arch/arm/mach-pxa/spitz.c 2005-11-01 20:28:43.000000000 +0100 @@ -321,6 +321,7 @@ }; +#ifdef CONFIG_MACH_AKITA /* * Irda */ @@ -339,10 +340,11 @@ else akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_IR_ON); } +#endif static struct pxaficp_platform_data spitz_ficp_platform_data = { .transceiver_cap = IR_SIRMODE | IR_OFF, - .transceiver_mode = spitz_irda_transceiver_mode, +// .transceiver_mode = spitz_irda_transceiver_mode, }; @@ -422,21 +424,6 @@ platform_device_register(&spitzscoop2_device); } -static void __init akita_init(void) -{ - spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode; - - /* We just pretend the second element of the array doesn't exist */ - scoop_num = 1; - scoop_devs = &spitz_pcmcia_scoop[0]; - spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity; - - platform_device_register(&akitaioexp_device); - - spitzscoop_device.dev.parent=&akitaioexp_device.dev; - common_init(); -} - static void __init fixup_spitz(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi) { @@ -474,6 +461,21 @@ #endif #ifdef CONFIG_MACH_AKITA +static void __init akita_init(void) +{ + spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode; + + /* We just pretend the second element of the array doesn't exist */ + scoop_num = 1; + scoop_devs = &spitz_pcmcia_scoop[0]; + spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity; + + platform_device_register(&akitaioexp_device); + + spitzscoop_device.dev.parent=&akitaioexp_device.dev; + common_init(); +} + MACHINE_START(AKITA, "SHARP Akita") .phys_ram = 0xa0000000, .phys_io = 0x40000000, -- Thanks, Sharp! - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/