diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-02-26 15:04:13 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-02-26 15:04:13 -0500 |
| commit | 8d6339b8a532ec4eeb31db321cf1e6068965deda (patch) | |
| tree | 0fa1d7aa14d3dcc6f6ac5236ba14649fd9a0d5e6 /arch/ia64/Makefile | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| parent | 32974ad4907cdde6c9de612cd1b2ee0568fb9409 (diff) | |
Pull rmia32 into release branch
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 475e2725fbde..8ae0d2604ce1 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/ |