Hi!
> > This is what I needed to do after update to latest linus
> > kernel. Perhaps it helps someone.
> >
> > Signed-off-by: Pavel Machek <[email protected]>
> >
> > , 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 <[email protected]>
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
