diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 12:44:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 12:44:56 -0400 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/misc/Makefile | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 4be5c6fc5ef..47af4cd08f0 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -40,3 +40,4 @@ obj-y += cb710/ | |||
| 40 | obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o | 40 | obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o |
| 41 | obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o | 41 | obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o |
| 42 | obj-$(CONFIG_PCH_PHUB) += pch_phub.o | 42 | obj-$(CONFIG_PCH_PHUB) += pch_phub.o |
| 43 | obj-y += ti-st/ | ||