diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:55:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:55:53 -0700 |
| commit | 6d8de3a26b5c20b04a9317b4446582167d5883da (patch) | |
| tree | aa71ab52059380fa2bbdcee4a0cf559a9dacdf01 /drivers/w1/Makefile | |
| parent | 7bbedd521310547ca73cc77adcf61fb85723adc3 (diff) | |
| parent | 0a25e4d5647003a32ba5496f9d0f40ba9c1e3863 (diff) | |
| download | kernel-crypto-6d8de3a26b5c20b04a9317b4446582167d5883da.tar.gz kernel-crypto-6d8de3a26b5c20b04a9317b4446582167d5883da.tar.xz kernel-crypto-6d8de3a26b5c20b04a9317b4446582167d5883da.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
Diffstat (limited to 'drivers/w1/Makefile')
| -rw-r--r-- | drivers/w1/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile index 80725c348e7..01fb5439147 100644 --- a/drivers/w1/Makefile +++ b/drivers/w1/Makefile @@ -6,6 +6,10 @@ ifneq ($(CONFIG_NET), y) EXTRA_CFLAGS += -DNETLINK_DISABLED endif +ifeq ($(CONFIG_W1_DS2433_CRC), y) +EXTRA_CFLAGS += -DCONFIG_W1_F23_CRC +endif + obj-$(CONFIG_W1) += wire.o wire-objs := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o @@ -13,8 +17,9 @@ obj-$(CONFIG_W1_MATROX) += matrox_w1.o obj-$(CONFIG_W1_THERM) += w1_therm.o obj-$(CONFIG_W1_SMEM) += w1_smem.o -obj-$(CONFIG_W1_DS9490) += ds9490r.o +obj-$(CONFIG_W1_DS9490) += ds9490r.o ds9490r-objs := dscore.o obj-$(CONFIG_W1_DS9490_BRIDGE) += ds_w1_bridge.o +obj-$(CONFIG_W1_DS2433) += w1_ds2433.o |