Re: [rft] Kill junk from s2ram resume paths

[Pavel Machek <pavel@ucw.cz>]

Hi!


> > > diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
> > > index 1415da1..9cebef7 100644
> > > --- a/arch/i386/kernel/acpi/wakeup.S
> > > +++ b/arch/i386/kernel/acpi/wakeup.S
> > > @@ -28,21 +28,6 @@ #define BEEP \
> > >  	movb	$15, %al; 	\
> > >  	outb	%al, $66;
> > >  
> > > -#define BEEP \
> > > -	inb	$97, %al; 	\
> > > -	outb	%al, $0x80; 	\
> > > -	movb	$3, %al; 	\
> > > -	outb	%al, $97; 	\
> > > -	outb	%al, $0x80; 	\
> > > -	movb	$-74, %al; 	\
> > > -	outb	%al, $67; 	\
> > > -	outb	%al, $0x80; 	\
> > > -	movb	$-119, %al; 	\
> > > -	outb	%al, $66; 	\
> > > -	outb	%al, $0x80; 	\
> > > -	movb	$15, %al; 	\
> > > -	outb	%al, $66;
> > > -
> > >  ALIGN
> > >  	.align	4096
> > >  ENTRY(wakeup_start)
> > 
> > This hunk rejected for me (against 2.6.23-rc1), but i'm testing x86_64, so
> > it did not matter ;-)
> 
> I think it's gone in favor of the more sophisticated beeping
> > > support.

No. It was merge problem on my side, I actually had _two_ times the
beeping macro.
									Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-
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/