projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
[powerpc.git]
/
drivers
/
w1
/
Makefile
diff --git
a/drivers/w1/Makefile
b/drivers/w1/Makefile
index
01fb543
..
6bb0b54
100644
(file)
--- a/
drivers/w1/Makefile
+++ b/
drivers/w1/Makefile
@@
-2,24
+2,8
@@
# Makefile for the Dallas's 1-wire bus.
#
# Makefile for the Dallas's 1-wire bus.
#
-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
obj-$(CONFIG_W1) += wire.o
wire-objs := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o
-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
-ds9490r-objs := dscore.o
-
-obj-$(CONFIG_W1_DS9490_BRIDGE) += ds_w1_bridge.o
+obj-y += masters/ slaves/
-obj-$(CONFIG_W1_DS2433) += w1_ds2433.o