diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-02-06 21:06:45 -0600 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-02-06 21:06:45 -0600 |
| commit | 256ae6a720618cbbfacc5e62ea1fe7c129d1b644 (patch) | |
| tree | 99fbc75fe12eeb737b42e0a8a8cef57df89596a6 /drivers/char/Makefile | |
| parent | e8318d98e95ddd3969c0701b5d15ec961ce786b2 (diff) | |
| parent | ef66a9d222718f080018d07f691faa1f01789e7d (diff) | |
| download | op-kernel-dev-256ae6a720618cbbfacc5e62ea1fe7c129d1b644.zip op-kernel-dev-256ae6a720618cbbfacc5e62ea1fe7c129d1b644.tar.gz | |
Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.25
Diffstat (limited to 'drivers/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 96fc01e..686fabb 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -77,6 +77,7 @@ obj-$(CONFIG_EFI_RTC) += efirtc.o obj-$(CONFIG_SGI_DS1286) += ds1286.o obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o obj-$(CONFIG_DS1302) += ds1302.o +obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/ ifeq ($(CONFIG_GENERIC_NVRAM),y) obj-$(CONFIG_NVRAM) += generic_nvram.o else |
