diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-07-21 18:16:54 -0400 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-07-21 18:16:54 -0400 |
| commit | 8294fafdafc602ed11f401c44628fab8558c5cf5 (patch) | |
| tree | c8d0371cfd05226b56d52bfde9c69f8caca4501d /include/asm-cris | |
| parent | 725c3a2d70f958adee807c178178819a50f68a56 (diff) | |
| parent | bf20e740a4bcc686de02e2fd1c1810a58872f46e (diff) | |
Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into release-2.6.27
Diffstat (limited to 'include/asm-cris')
| -rw-r--r-- | include/asm-cris/Kbuild | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild index 17455459c43f..b7037d80d461 100644 --- a/include/asm-cris/Kbuild +++ b/include/asm-cris/Kbuild | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | header-$(CONFIG_ETRAX_ARCH_V10) += arch-v10/ | 3 | header-y += arch/ |
| 4 | header-$(CONFIG_ETRAX_ARCH_V32) += arch-v32/ | 4 | header-y += arch-v10/ |
| 5 | header-y += arch-v32/ | ||
| 5 | 6 | ||
| 6 | header-y += ethernet.h | 7 | header-y += ethernet.h |
| 7 | header-y += rtc.h | 8 | header-y += rtc.h |