diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
| commit | 1ed31d6db90d51010545921e59d369d2f92b7ac2 (patch) | |
| tree | 358a0b346bc8135cd5e53700eb44308b1a7c8c5b /drivers/misc/Makefile | |
| parent | ceba1abcb00b0ef0b1efcd715285f6e05523edef (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 208ae3091a4e..f12dc3e54402 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -28,3 +28,4 @@ obj-$(CONFIG_C2PORT) += c2port/ | |||
| 28 | obj-$(CONFIG_IWMC3200TOP) += iwmc3200top/ | 28 | obj-$(CONFIG_IWMC3200TOP) += iwmc3200top/ |
| 29 | obj-y += eeprom/ | 29 | obj-y += eeprom/ |
| 30 | obj-y += cb710/ | 30 | obj-y += cb710/ |
| 31 | obj-$(CONFIG_VMWARE_BALLOON) += vmware_balloon.o | ||