lkml.org 
[lkml]   [2005]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Make spitz compile again
Hi!

> > I needed this to get it to compile... Please apply (probably modulo //
> > part).
> >
> > Signed-off-by: Pavel Machek <pavel@suse.cz>

Fixed patch follows.

--- 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 21:38:19.000000000 +0100
@@ -332,6 +332,7 @@
reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_IR_ON);
}

+#ifdef CONFIG_MACH_AKITA
static void akita_irda_transceiver_mode(struct device *dev, int mode)
{
if (mode & IR_OFF)
@@ -339,6 +340,7 @@
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,
@@ -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/

\
 
 \ /
  Last update: 2005-11-01 21:43    [W:0.051 / U:0.500 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site