diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
| commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
| tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /arch/s390/Makefile | |
| parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/s390/Makefile')
| -rw-r--r-- | arch/s390/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index 98db30481d97..73a09a6ee6c8 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile | |||
| @@ -76,9 +76,7 @@ AFLAGS += $(aflags-y) | |||
| 76 | OBJCOPYFLAGS := -O binary | 76 | OBJCOPYFLAGS := -O binary |
| 77 | LDFLAGS_vmlinux := -e start | 77 | LDFLAGS_vmlinux := -e start |
| 78 | 78 | ||
| 79 | head-$(CONFIG_ARCH_S390_31) += arch/$(ARCH)/kernel/head.o | 79 | head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o |
| 80 | head-$(CONFIG_ARCH_S390X) += arch/$(ARCH)/kernel/head64.o | ||
| 81 | head-y += arch/$(ARCH)/kernel/init_task.o | ||
| 82 | 80 | ||
| 83 | core-y += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ arch/$(ARCH)/crypto/ \ | 81 | core-y += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ arch/$(ARCH)/crypto/ \ |
| 84 | arch/$(ARCH)/appldata/ | 82 | arch/$(ARCH)/appldata/ |