diff options
author | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
tree | 06a3183a562f8da4688f65023f7a18dcad702956 /drivers/clocksource/Makefile | |
parent | [AGPGART] Make AGP depend on PCI (diff) | |
parent | [PATCH] KConfig: Spellchecking 'similarity' and 'independent' (diff) | |
download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz linux-55b4d6a52195a8f277ffddf755ddaff359878f41.zip |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/clocksource/Makefile')
-rw-r--r-- | drivers/clocksource/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile new file mode 100644 index 000000000000..a52225470225 --- /dev/null +++ b/drivers/clocksource/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_X86_CYCLONE_TIMER) += cyclone.o +obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o +obj-$(CONFIG_SCx200HR_TIMER) += scx200_hrt.o |