diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-29 00:38:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-29 00:38:10 +0000 |
| commit | 1b510dad9c505ae07b5fe432f8c3c675638e54e3 (patch) | |
| tree | 655e0f3d26b82285b71f181393bd9b1ab411182a | |
| parent | 90ebbe69db7e6d417e09b9c8013bc39615fc0a12 (diff) | |
| parent | b194b853111d6012bc738b872d5d0cf294343a53 (diff) | |
| download | cuttlefish-modules-1b510dad9c505ae07b5fe432f8c3c675638e54e3.tar.gz | |
Merge "Enable wlan_simulation driver" into android-4.19
| -rw-r--r-- | Kbuild | 1 | ||||
| -rw-r--r-- | wlan_simulation/Kbuild | 2 | ||||
| -rw-r--r-- | wlan_simulation/Makefile | 6 |
3 files changed, 2 insertions, 7 deletions
@@ -1 +1,2 @@ obj-m += virtio_gpu/ +obj-m += wlan_simulation/ diff --git a/wlan_simulation/Kbuild b/wlan_simulation/Kbuild index fdad86c..83b9abc 100644 --- a/wlan_simulation/Kbuild +++ b/wlan_simulation/Kbuild @@ -1,2 +1,2 @@ +virt_wifi_sim-objs := virt_wifi_simulation.o virt_wifi_data.o obj-m += virt_wifi_sim.o -virt_wifi_sim-objs = virt_wifi_simulation.o virt_wifi_data.o diff --git a/wlan_simulation/Makefile b/wlan_simulation/Makefile deleted file mode 100644 index 2724d5e..0000000 --- a/wlan_simulation/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -all: - $(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS) -modules_install: - $(MAKE) M=$(M) -C $(KERNEL_SRC) modules_install -clean: - $(MAKE) -C $(KERNEL_SRC) M=$(M) clean |