tree bca8744b64671a92c349e4c08e29eef93c5a2a14
parent bd78432c8f209a1028f4e5bada8b1da1d8e4da09
author Truxton Fulton <trux@truxton.com> 1185030638 +0200
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1185068230 -0700

i386: fix machine rebooting

Commit 59f4e7d572980a521b7bdba74ab71b21f5995538 fixed machine rebooting
on Truxton's machine (when no keyboard was present).  But it broke it on
Lee's machine.

The patch reinstates the old (pre-59f4e7d572980a521b7bdba74ab71b21f5995538)
code and if that doesn't work out, try the new,
post-59f4e7d572980a521b7bdba74ab71b21f5995538 code instead.

Cc: Lee Garrett <lee-in-berlin@web.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>