diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
| commit | 772320e84588dcbe1600ffb83e5f328f2209ac2a (patch) | |
| tree | a7de21b79340aeaa17c58126f6b801b82c77b53a /arch/ia64/Makefile | |
| parent | 1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
Diffstat (limited to 'arch/ia64/Makefile')
| -rw-r--r-- | arch/ia64/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 62b10f5f2540..be7bfa12b705 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
| @@ -46,7 +46,6 @@ head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o | |||
| 46 | 46 | ||
| 47 | libs-y += arch/ia64/lib/ | 47 | libs-y += arch/ia64/lib/ |
| 48 | core-y += arch/ia64/kernel/ arch/ia64/mm/ | 48 | core-y += arch/ia64/kernel/ arch/ia64/mm/ |
| 49 | core-$(CONFIG_IA32_SUPPORT) += arch/ia64/ia32/ | ||
| 50 | core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ | 49 | core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ |
| 51 | core-$(CONFIG_IA64_DIG_VTD) += arch/ia64/dig/ | 50 | core-$(CONFIG_IA64_DIG_VTD) += arch/ia64/dig/ |
| 52 | core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ | 51 | core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ |