diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-27 09:18:23 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-27 09:18:23 +0000 |
| commit | 15800b8e588e5b89a76a30746dea5ef1ae133bfc (patch) | |
| tree | e84813e66c6fd1dbc82f846752e6a904ee6a2fbb /linux | |
| parent | 082dee9e5c3c87067ef651bddb4e7976a1441dde (diff) | |
Attempt to fix that annoying random tosa kernel patch application failure. Turns out our piro.patch had carriage returns in it.. was busted as commited to OE, so disabling eoln->native translation exposed the bug.
BKrev: 41a8465fl3phzTZ339CqzY5bLd3q2A
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/piro.patch | 36 | ||||
| -rw-r--r-- | linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/piro.patch b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/piro.patch index 3f1618971f..27fc518a79 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/piro.patch +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/piro.patch @@ -4035,8 +4035,8 @@ diff -Nur linux_c860_org/arch/arm/mach-pxa/sharpsl_power.c linux/arch/arm/mach-p -#if defined(CONFIG_ARCH_PXA_SHEPHERD) +#if defined(CONFIG_SL7X0_POWER_KEY_OFF) -+static int key_suspend_thread(void* unused)
-+{
++static int key_suspend_thread(void* unused) ++{ + int time_cnt = 0; + + // daemonize(); @@ -4062,18 +4062,18 @@ diff -Nur linux_c860_org/arch/arm/mach-pxa/sharpsl_power.c linux/arch/arm/mach-p + // maybe apps is dead, so we have to restart. + pm_do_suspend(); + } -+ return 0;
-+}
-+
-+void slc7x0_key_suspend(void)
-+{
-+ apm_wakeup_src_mask = 0;
-+ wake_up(&key_off);
-+}
-+
-+EXPORT_SYMBOL(slc7x0_key_suspend);
++ return 0; ++} ++ ++void slc7x0_key_suspend(void) ++{ ++ apm_wakeup_src_mask = 0; ++ wake_up(&key_off); ++} ++ ++EXPORT_SYMBOL(slc7x0_key_suspend); + -+#endif
++#endif + + + @@ -10166,7 +10166,7 @@ diff -Nur linux_c860_org/drivers/char/corgi_logkey.c linux/drivers/char/corgi_lo } - if ((rollover_count > 3) || - ((rollover_count == 3) && -+ if ((rollover_count > MAX_KEY_PRESS_THRESHOLD) ||
++ if ((rollover_count > MAX_KEY_PRESS_THRESHOLD) || + ((rollover_count == MAX_KEY_PRESS_THRESHOLD) && (!ROLLOVER_CHECK_FLAG(rollover_flag, ROLLOVER_TAB) || ROLLOVER_CHECK_FLAG(rollover_flag, ROLLOVER_DIRECT_ON)) && @@ -69312,8 +69312,8 @@ diff -Nur linux_c860_org/drivers/video/w100fb.c linux/drivers/video/w100fb.c +#if defined(CONFIG_CORGI_LCD_BUFF) + remapped_fbuf = __ioremap(W100_FB_BASE, REMAPPED_FB_LEN, L_PTE_BUFFERABLE ); +#else -+ remapped_fbuf = ioremap_nocache(W100_FB_BASE, REMAPPED_FB_LEN);
-+#endif
++ remapped_fbuf = ioremap_nocache(W100_FB_BASE, REMAPPED_FB_LEN); ++#endif + isRemapped = 1; } @@ -69617,8 +69617,8 @@ diff -Nur linux_c860_org/drivers/video/w100fb.c linux/drivers/video/w100fb.c - printk("reset resolution unkown => 480x640\n"); - w100_init_sharp_lcd(LCD_SHARP_VGA); +#if defined(CONFIG_FBCON_ROTATE_R) -+ printk("reset resolution unkown => 480x640\n");
-+ w100_init_sharp_lcd(LCD_SHARP_VGA);
++ printk("reset resolution unkown => 480x640\n"); ++ w100_init_sharp_lcd(LCD_SHARP_VGA); w100fb_lcdMode = LCD_MODE_480; +#else + printk("reset resolution unkown => 640x480\n"); diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe index ab05622166..fb5937bb18 100644 --- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe +++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe @@ -5,7 +5,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r22" +PR = "r23" DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices." MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" |