diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
| commit | 0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854 (patch) | |
| tree | a3413237c8dee15dfe620848fecb37408a096345 /drivers/Makefile | |
| parent | 30656167bd2347bf867a09cbae2705bd927d3983 (diff) | |
| parent | 8ff0513bdcdd71e84aa561cce216675d43fb41b8 (diff) | |
| download | lwn-0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854.tar.gz lwn-0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854.zip | |
Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux
From Boris:
"""
Three simple fixes:
- the first one is fixing a non-critical bug in the gpmi driver
- the second one is fixing a bug in the 'automatic NAND timings
selection' feature introduced in 4.9-rc1
- the last one is fixing a false positive uninitialized-var warning
"""
Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index f0afdfb3c7df..194d20bee7dc 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -21,7 +21,7 @@ obj-y += video/ obj-y += idle/ # IPMI must come before ACPI in order to provide IPMI opregion support -obj-$(CONFIG_IPMI_HANDLER) += char/ipmi/ +obj-y += char/ipmi/ obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_SFI) += sfi/ |