Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / misc / hdpuftrs / Makefile
1 obj-$(CONFIG_HDPU_FEATURES) := hdpu_cpustate.o hdpu_nexus.o