diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /drivers/media/video/pwc/Makefile | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/media/video/pwc/Makefile')
| -rw-r--r-- | drivers/media/video/pwc/Makefile | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/media/video/pwc/Makefile b/drivers/media/video/pwc/Makefile index 8326684f49f3..33d60126c024 100644 --- a/drivers/media/video/pwc/Makefile +++ b/drivers/media/video/pwc/Makefile | |||
| @@ -1,20 +1,3 @@ | |||
| 1 | ifneq ($(KERNELRELEASE),) | ||
| 2 | |||
| 3 | pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o pwc-timon.o pwc-kiara.o | 1 | pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o pwc-timon.o pwc-kiara.o |
| 4 | 2 | ||
| 5 | obj-$(CONFIG_USB_PWC) += pwc.o | 3 | obj-$(CONFIG_USB_PWC) += pwc.o |
| 6 | |||
| 7 | else | ||
| 8 | |||
| 9 | KDIR := /lib/modules/$(shell uname -r)/build | ||
| 10 | PWD := $(shell pwd) | ||
| 11 | |||
| 12 | default: | ||
| 13 | $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules | ||
| 14 | |||
| 15 | endif | ||
| 16 | |||
| 17 | clean: | ||
| 18 | rm -f *.[oas] .*.flags *.ko .*.cmd .*.d .*.tmp *.mod.c | ||
| 19 | rm -rf .tmp_versions | ||
| 20 | |||