diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-12 11:02:03 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-12 11:02:03 -0400 |
| commit | 82681a318f9f028ea64e61f24bbd9ac535531921 (patch) | |
| tree | 529b6a5b4fd040fb54b7672b1a224ebd47445876 /drivers/net/Makefile | |
| parent | 3860c97bd60a4525bb62eb90e3e7d2f02662ac59 (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
[SCSI] Merge branch 'linus'
Conflicts:
drivers/message/fusion/mptsas.c
fixed up conflict between req->data_len accessors and mptsas driver updates.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e6f1f8c3f8d4..db30ebd7b262 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -103,7 +103,7 @@ obj-$(CONFIG_HAMACHI) += hamachi.o | |||
| 103 | obj-$(CONFIG_NET) += Space.o loopback.o | 103 | obj-$(CONFIG_NET) += Space.o loopback.o |
| 104 | obj-$(CONFIG_SEEQ8005) += seeq8005.o | 104 | obj-$(CONFIG_SEEQ8005) += seeq8005.o |
| 105 | obj-$(CONFIG_NET_SB1000) += sb1000.o | 105 | obj-$(CONFIG_NET_SB1000) += sb1000.o |
| 106 | obj-$(CONFIG_MAC8390) += mac8390.o 8390.o | 106 | obj-$(CONFIG_MAC8390) += mac8390.o |
| 107 | obj-$(CONFIG_APNE) += apne.o 8390.o | 107 | obj-$(CONFIG_APNE) += apne.o 8390.o |
| 108 | obj-$(CONFIG_PCMCIA_PCNET) += 8390.o | 108 | obj-$(CONFIG_PCMCIA_PCNET) += 8390.o |
| 109 | obj-$(CONFIG_HP100) += hp100.o | 109 | obj-$(CONFIG_HP100) += hp100.o |