[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: debian-installer



> > I think I had uploaded -7 just before I left, but I could not include
> > Michaels patches, since they would not apply to my tree. The easiest thing
> > for me would be if everything is in the CVS, I would then start building
> > 2.6.19.
>
> Roman has been making noises to that effect. I've not run a cvs update
> since; 2.6.19 is the way to go if we can actually get that into etch. If
> that's not possible, I'll try to generate a fresh patch against 2.6.18-7

OK, here's what I found out: The only piece that is missing from 2.6.18-8
(and, presumably, -7) is actually switching on the config options for
FB_ATARI, KEYBOARD_ATARI and MOUSE_ATARI. These options were not new,
that's why they never showed up in any of my patches.

--- linux-2.6-2.6.18/debian/arch/m68k/config.atari.org	2006-12-20 16:48:03.000000000 +0100
+++ linux-2.6-2.6.18/debian/arch/m68k/config.atari	2006-12-20 16:48:44.000000000 +0100
@@ -47,8 +47,10 @@
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATARI=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_ATARI=y
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_MISC=y
@@ -70,6 +72,7 @@
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
+CONFIG_FB_ATARI=y
 CONFIG_FB_ATY=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set

After a good look at the diff between 2.6.18-7 and my CVS based 2.6.18
devel tree, there does not seem to be more to it. Recent changes to my
tree are not covered by this; I'll submit patches to Christian separately.
This includes cleanup of atafb, and transmit timeout handling for mac88x0
and macmace.

	Michael



Reply to: