Skip to content

Commit

Permalink
iwlwifi: Fix Makefile build order for built-in driver
Browse files Browse the repository at this point in the history
When the driver is built into the kernel instead of a module
when the system boots it results in a panic. The order things are built in
results in their initialization order when built into the kernel. Wifi
has to be initialized before mvm or dvm.

Reviewed-by: Donald H Fry <donald.h.fry@intel.com>
Tested-by: Donald H Fry <donald.h.fry@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Brandon Misemer <brandon.misemer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Brandon Misemer authored and Johannes Berg committed Jun 13, 2012
1 parent 1174173 commit 65fe593
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/net/wireless/iwlwifi/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
obj-$(CONFIG_IWLDVM) += dvm/

CFLAGS_iwl-devtrace.o := -I$(src)

# common
obj-$(CONFIG_IWLWIFI) += iwlwifi.o
iwlwifi-objs += iwl-io.o
Expand All @@ -16,3 +12,8 @@ iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-test.o

ccflags-y += -D__CHECK_ENDIAN__ -I$(src)


obj-$(CONFIG_IWLDVM) += dvm/

CFLAGS_iwl-devtrace.o := -I$(src)

0 comments on commit 65fe593

Please sign in to comment.