diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-23 04:11:56 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-23 04:11:56 +0200 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /drivers/w1/Makefile | |
| parent | [PATCH] libata: convert several bmdma-style controllers to new EH, take #3 (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff) | |
| download | linux-71d530cd1b6d97094481002a04c77fea1c8e1c22.tar.xz linux-71d530cd1b6d97094481002a04c77fea1c8e1c22.zip | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/w1/Makefile')
| -rw-r--r-- | drivers/w1/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile index 0c2aa22d8c04..93845a2c7c21 100644 --- a/drivers/w1/Makefile +++ b/drivers/w1/Makefile @@ -2,10 +2,6 @@ # 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 |