diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-14 03:11:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-14 03:11:46 -0400 |
| commit | ed859ed3b0f9893c6bce3708e8928341c15699b9 (patch) | |
| tree | 59c507f00bc13becb4accdd64fdc01ece08b4645 /drivers/misc/Makefile | |
| parent | a8027073eb127cd207070891374b5c54c2ce3d23 (diff) | |
| parent | 53eeb64e808971207350386121f4bab12fa2f45f (diff) | |
Merge branch 'linus' into sched/core
Merge reason: update from -rc5 to -almost-final
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 255a80dc9d73..42eab95cde2a 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -33,5 +33,5 @@ obj-$(CONFIG_IWMC3200TOP) += iwmc3200top/ | |||
| 33 | obj-$(CONFIG_HMC6352) += hmc6352.o | 33 | obj-$(CONFIG_HMC6352) += hmc6352.o |
| 34 | obj-y += eeprom/ | 34 | obj-y += eeprom/ |
| 35 | obj-y += cb710/ | 35 | obj-y += cb710/ |
| 36 | obj-$(CONFIG_VMWARE_BALLOON) += vmware_balloon.o | 36 | obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o |
| 37 | obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o | 37 | obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o |