diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:36:28 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:36:28 +0100 |
| commit | f2d40cd92c5604a868b22c44a7858206ae4fcf35 (patch) | |
| tree | 40f3e49465ede8982f6b95b7ba51b9a9ebf22ff6 /arch/i386/boot/edd.c | |
| parent | 3ca135e16a393e5c5cf6490ce751e43c59011dde (diff) | |
| parent | 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 (diff) | |
| download | kernel_replicant_linux-f2d40cd92c5604a868b22c44a7858206ae4fcf35.tar.gz kernel_replicant_linux-f2d40cd92c5604a868b22c44a7858206ae4fcf35.tar.bz2 kernel_replicant_linux-f2d40cd92c5604a868b22c44a7858206ae4fcf35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/i386/boot/edd.c')
| -rw-r--r-- | arch/i386/boot/edd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c index 77d92daf7923..658834d9f92a 100644 --- a/arch/i386/boot/edd.c +++ b/arch/i386/boot/edd.c @@ -127,7 +127,7 @@ static int get_edd_info(u8 devno, struct edd_info *ei) ax = 0x4800; dx = devno; asm("pushfl; int $0x13; popfl" - : "+a" (ax), "+d" (dx) + : "+a" (ax), "+d" (dx), "=m" (ei->params) : "S" (&ei->params) : "ebx", "ecx", "edi"); |