diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
tree | f59185b71c8059941de79143f71178453599b8f1 /drivers/char/Makefile | |
parent | b3acf29afda06c76774dc6df6246c37ae707836b (diff) | |
parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r-- | drivers/char/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 1a4247dccac..438f71317c5 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -74,8 +74,6 @@ obj-$(CONFIG_RTC) += rtc.o obj-$(CONFIG_HPET) += hpet.o obj-$(CONFIG_GEN_RTC) += genrtc.o 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) |