diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | drivers/scsi/cxgb3i/Kbuild | 2 |
2 files changed, 2 insertions, 4 deletions
| @@ -140,15 +140,13 @@ _all: modules | |||
| 140 | endif | 140 | endif |
| 141 | 141 | ||
| 142 | srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR)) | 142 | srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR)) |
| 143 | TOPDIR := $(srctree) | ||
| 144 | # FIXME - TOPDIR is obsolete, use srctree/objtree | ||
| 145 | objtree := $(CURDIR) | 143 | objtree := $(CURDIR) |
| 146 | src := $(srctree) | 144 | src := $(srctree) |
| 147 | obj := $(objtree) | 145 | obj := $(objtree) |
| 148 | 146 | ||
| 149 | VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) | 147 | VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) |
| 150 | 148 | ||
| 151 | export srctree objtree VPATH TOPDIR | 149 | export srctree objtree VPATH |
| 152 | 150 | ||
| 153 | 151 | ||
| 154 | # SUBARCH tells the usermode build what the underlying arch is. That is set | 152 | # SUBARCH tells the usermode build what the underlying arch is. That is set |
diff --git a/drivers/scsi/cxgb3i/Kbuild b/drivers/scsi/cxgb3i/Kbuild index 25a2032bfa26..70d060b7ff4f 100644 --- a/drivers/scsi/cxgb3i/Kbuild +++ b/drivers/scsi/cxgb3i/Kbuild | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb3 | 1 | EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3 |
| 2 | 2 | ||
| 3 | cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o | 3 | cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o |
| 4 | obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o | 4 | obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o |