diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-29 11:49:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-29 11:49:43 +1000 |
| commit | 11173034056737550f8876bf00e60d1aa7349242 (patch) | |
| tree | 8288534486872103aa979b1020f9d04cb73854df /arch | |
| parent | 01c7f7b84a1964fc330ce28ac085ee0fbb8c098d (diff) | |
| parent | b3087e48ce20be784fae1dbabc2e42e2ad0f21bc (diff) | |
Merge remote-tracking branch 'virtio/virtio-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lguest/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/lguest/head_32.S (renamed from arch/x86/lguest/i386_head.S) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lguest/Makefile b/arch/x86/lguest/Makefile index 94e0e54056a9..8f38d577a2fa 100644 --- a/arch/x86/lguest/Makefile +++ b/arch/x86/lguest/Makefile @@ -1,2 +1,2 @@ -obj-y := i386_head.o boot.o +obj-y := head_32.o boot.o CFLAGS_boot.o := $(call cc-option, -fno-stack-protector) diff --git a/arch/x86/lguest/i386_head.S b/arch/x86/lguest/head_32.S index 6ddfe4fc23c3..6ddfe4fc23c3 100644 --- a/arch/x86/lguest/i386_head.S +++ b/arch/x86/lguest/head_32.S |