diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 16:21:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 16:21:50 -0700 |
| commit | 5d7cb157025b3b4852f38e6e5e97d06ef12c1d78 (patch) | |
| tree | 09831b553687b51749ed99dbabaf3687a4e4bd2a /arch/cris/include/asm/Kbuild | |
| parent | fc58fb180755cdeda3ce58776eef94a01b37a1c1 (diff) | |
| parent | 8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup:
defconfig reduction
kbuild: drop unifdef-y support
archs: replace unifdef-y with header-y
include: replace unifdef-y with header-y
Diffstat (limited to 'arch/cris/include/asm/Kbuild')
| -rw-r--r-- | arch/cris/include/asm/Kbuild | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index d5b631935ec8..956eea246b97 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -4,8 +4,7 @@ header-y += arch-v10/ header-y += arch-v32/ header-y += ethernet.h +header-y += etraxgpio.h +header-y += rs485.h header-y += rtc.h header-y += sync_serial.h - -unifdef-y += etraxgpio.h -unifdef-y += rs485.h |