]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
lguest: fix mis-merge against hpa's TSS renaming
authorRusty Russell <rusty@rustcorp.com.au>
Thu, 31 Jan 2008 07:00:47 +0000 (18:00 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jan 2008 08:59:44 +0000 (19:59 +1100)
commite95035c61a4c3dae1aa543a5bf5b39846daca061
treef0977e07936253923239ff1f251192607cc873ab
parent24af8cb86973dde9bf8df51bef923fda8718bdb5
lguest: fix mis-merge against hpa's TSS renaming

drivers/lguest/x86/core.c: In function ‘copy_in_guest_info’:
drivers/lguest/x86/core.c:97: error: ‘struct x86_hw_tss’ has no member named ‘esp1’

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/lguest/x86/core.c