diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 08:51:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 08:51:12 -0400 |
| commit | d597690eef4142cf622fd469859ecc56506119b5 (patch) | |
| tree | e0be5d05994de4b4243a4c76cf6ca13380c3eac3 /drivers/pci | |
| parent | 96b585267f552d4b6a28ea8bd75e5ed03deb6e71 (diff) | |
| parent | 9049fc745300c5e2236cbfc69f5e8cadb6f1f57c (diff) | |
| download | linux-stable-d597690eef4142cf622fd469859ecc56506119b5.tar.gz linux-stable-d597690eef4142cf622fd469859ecc56506119b5.tar.bz2 linux-stable-d597690eef4142cf622fd469859ecc56506119b5.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge even more updates from Andrew Morton:
- dma-mapping API cleanup
- a few cleanups and misc things
- use jump labels in dynamic-debug
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
dynamic_debug: add jump label support
jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL
arm: jump label may reference text in __exit
tile: support static_key usage in non-module __exit sections
sparc: support static_key usage in non-module __exit sections
powerpc: add explicit #include <asm/asm-compat.h> for jump label
drivers/media/dvb-frontends/cxd2841er.c: avoid misleading gcc warning
MAINTAINERS: update email and list of Samsung HW driver maintainers
block: remove BLK_DEV_DAX config option
samples/kretprobe: fix the wrong type
samples/kretprobe: convert the printk to pr_info/pr_err
samples/jprobe: convert the printk to pr_info/pr_err
samples/kprobe: convert the printk to pr_info/pr_err
dma-mapping: use unsigned long for dma_attrs
media: mtk-vcodec: remove unused dma_attrs
include/linux/bitmap.h: cleanup
tree-wide: replace config_enabled() with IS_ENABLED()
drivers/fpga/Kconfig: fix build failure
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/ecam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/ecam.c b/drivers/pci/ecam.c index 66e0d718472f..43ed08dd8b01 100644 --- a/drivers/pci/ecam.c +++ b/drivers/pci/ecam.c @@ -27,7 +27,7 @@ * since we have enough virtual address range available. On 32-bit, we * ioremap the config space for each bus individually. */ -static const bool per_bus_mapping = !config_enabled(CONFIG_64BIT); +static const bool per_bus_mapping = !IS_ENABLED(CONFIG_64BIT); /* * Create a PCI config space window |