diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 09:10:44 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 09:10:44 +0100 |
commit | a5a64498c194c82ecad3a2d67cff6231cda8d3dd (patch) | |
tree | 723d5d81419f9960b8d30ed9a2ece8a58d6c4328 /arch/avr32/boards/atngw100/Makefile | |
parent | rtc-cmos: export second NVRAM bank (diff) | |
parent | Linux 2.6.28-rc4 (diff) | |
download | linux-a5a64498c194c82ecad3a2d67cff6231cda8d3dd.tar.xz linux-a5a64498c194c82ecad3a2d67cff6231cda8d3dd.zip |
Merge commit 'v2.6.28-rc4' into timers/rtc
Conflicts:
drivers/rtc/rtc-cmos.c
Diffstat (limited to 'arch/avr32/boards/atngw100/Makefile')
-rw-r--r-- | arch/avr32/boards/atngw100/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/avr32/boards/atngw100/Makefile b/arch/avr32/boards/atngw100/Makefile index c740aa116755..6376f5322e4d 100644 --- a/arch/avr32/boards/atngw100/Makefile +++ b/arch/avr32/boards/atngw100/Makefile @@ -1 +1,2 @@ -obj-y += setup.o flash.o +obj-y += setup.o flash.o +obj-$(CONFIG_BOARD_ATNGW100_EVKLCD10X) += evklcd10x.o |