diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 00:54:45 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 00:54:45 +0100 |
commit | 245f0db0de926601353776085e6f6a4c974c5615 (patch) | |
tree | b493e9e726f4a898041f7861d0df328aa1a348a1 /drivers/net/wireless/intersil/prism54/Makefile | |
parent | Input: synaptics-rmi4 - using logical instead of bitwise AND (diff) | |
parent | Linux 4.5 (diff) | |
download | linux-245f0db0de926601353776085e6f6a4c974c5615.tar.xz linux-245f0db0de926601353776085e6f6a4c974c5615.zip |
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to
fix pxa/raumfeld rotary encoder properties.
Diffstat (limited to 'drivers/net/wireless/intersil/prism54/Makefile')
-rw-r--r-- | drivers/net/wireless/intersil/prism54/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/intersil/prism54/Makefile b/drivers/net/wireless/intersil/prism54/Makefile new file mode 100644 index 000000000000..fad305c76737 --- /dev/null +++ b/drivers/net/wireless/intersil/prism54/Makefile @@ -0,0 +1,8 @@ +# $Id: Makefile.k26,v 1.7 2004/01/30 16:24:00 ajfa Exp $ + +prism54-objs := islpci_eth.o islpci_mgt.o \ + isl_38xx.o isl_ioctl.o islpci_dev.o \ + islpci_hotplug.o oid_mgt.o + +obj-$(CONFIG_PRISM54) += prism54.o + |