diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-22 19:49:27 -0400 |
|---|---|---|
| committer | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-22 19:49:27 -0400 |
| commit | f056878332a91ed984a116bad4e7d49aefff9e6e (patch) | |
| tree | 572f4757c8e7811d45e0be0c2ae529c78fb63441 /Documentation/connector/Makefile | |
| parent | 3961f7c3cf247eee5df7fabadc7a40f2deeb98f3 (diff) | |
| parent | 7fa07729e439a6184bd824746d06a49cca553f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/wm97xx_battery.c
Diffstat (limited to 'Documentation/connector/Makefile')
| -rw-r--r-- | Documentation/connector/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/connector/Makefile b/Documentation/connector/Makefile index 8df1a7285a06..d98e4df98e24 100644 --- a/Documentation/connector/Makefile +++ b/Documentation/connector/Makefile | |||
| @@ -9,3 +9,8 @@ hostprogs-y := ucon | |||
| 9 | always := $(hostprogs-y) | 9 | always := $(hostprogs-y) |
| 10 | 10 | ||
| 11 | HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include | 11 | HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include |
| 12 | |||
| 13 | all: modules | ||
| 14 | |||
| 15 | modules clean: | ||
| 16 | $(MAKE) -C ../.. SUBDIRS=$(PWD) $@ | ||