Alan Cox cc4e33d961 atomisp2: unify some ifdef cases caused by format changes ...

The two drivers were originally merged by tools, and the tools didn't always
spot white space only changes. Fix a few of them found by zero-day and clean
up some more by hand.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2017-03-06 12:31:17 +01:00

..

accessibility

…

acpi

Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

2017-03-03 16:48:48 -08:00

amba

…

android

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>

2017-03-02 08:42:29 +01:00

ata

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2017-03-03 21:36:56 -08:00

atm

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

auxdisplay

…

base

Merge branch 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-03-03 11:38:56 -08:00

bcma

…

block

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2017-03-03 21:36:56 -08:00

bluetooth

btmrvl: fix spelling mistake: "actived" -> "activated"

2017-02-19 00:26:37 +01:00

bus

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-02-23 15:57:04 -08:00

cdrom

Merge branch 'for-4.11/next' into for-4.11/linus-merge

2017-02-17 14:08:19 -07:00

char

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

clk

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-03-03 16:15:48 -08:00

clocksource

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>

2017-03-02 08:42:27 +01:00

connector

…

cpufreq

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

cpuidle

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

crypto

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2017-03-04 10:42:53 -08:00

dax

sched/headers: Prepare to remove the <linux/magic.h> include from <linux/sched/task_stack.h>

2017-03-02 08:42:40 +01:00

dca

…

devfreq

scripts/spelling.txt: add "followings" pattern and fix typo instances

2017-02-27 18:43:47 -08:00

dio

…

dma

sched/headers: Prepare to move the get_task_struct()/put_task_struct() and related APIs from <linux/sched.h> to <linux/sched/task.h>

2017-03-02 08:42:40 +01:00

dma-buf

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

edac

Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-02-20 12:47:44 -08:00

eisa

…

extcon

scripts/spelling.txt: add "swithc" pattern and fix typo instances

2017-02-27 18:43:46 -08:00

firewire

Merge branch 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax

2017-02-28 20:29:41 -08:00

firmware

sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h>

2017-03-02 08:42:27 +01:00

fmc

…

fpga

…

fsi

…

gpio

Merge tag 'gpio-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2017-02-23 08:46:04 -08:00

gpu

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

hid

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

hsi

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

hv

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

hwmon

scripts/spelling.txt: add "followings" pattern and fix typo instances

2017-02-27 18:43:47 -08:00

hwspinlock

…

hwtracing

mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf

2017-02-24 17:46:54 -08:00

i2c

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

ide

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

idle

Merge tag 'pm-turbostat-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2017-03-02 17:41:27 -08:00

iio

Merge tag 'staging-4.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2017-03-04 11:26:18 -08:00

infiniband

sched/headers: Prepare to move the get_task_struct()/put_task_struct() and related APIs from <linux/sched.h> to <linux/sched/task.h>

2017-03-02 08:42:40 +01:00

input

Input: rmi4 - f30: detect INPUT_PROP_BUTTONPAD from the button count

2017-03-01 10:01:56 -08:00

iommu

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/mm.h>

2017-03-02 08:42:28 +01:00

ipack

…

irqchip

Merge tag 'iommu-updates-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2017-02-20 16:42:43 -08:00

isdn

sched/headers: Prepare to move cputime functionality from <linux/sched.h> into <linux/sched/cputime.h>

2017-03-02 08:42:39 +01:00

leds

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/loadavg.h>

2017-03-02 08:42:27 +01:00

lguest

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

lightnvm

…

macintosh

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

mailbox

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

mcb

…

md

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

media

sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h>

2017-03-02 08:42:37 +01:00

memory

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-02-23 15:57:04 -08:00

memstick

Merge branch 'for-4.11/next' into for-4.11/linus-merge

2017-02-17 14:08:19 -07:00

message

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2017-02-21 11:51:42 -08:00

mfd

Merge tag 'staging-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2017-02-22 12:14:01 -08:00

misc

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

mmc

sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h>

2017-03-02 08:42:27 +01:00

mtd

Merge branch 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-03-03 11:38:56 -08:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-03-04 17:31:39 -08:00

nfc

scripts/spelling.txt: add "omited" pattern and fix typo instances

2017-02-27 18:43:47 -08:00

ntb

ntb: ntb_hw_intel: link_poll isn't clearing the pending status properly

2017-02-16 23:11:26 -05:00

nubus

…

nvdimm

nfit, libnvdimm: fix interleave set cookie calculation

2017-03-01 00:49:42 -08:00

nvme

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2017-03-03 10:53:35 -08:00

nvmem

…

of

Merge tag 'devicetree-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2017-02-22 19:23:14 -08:00

oprofile

sched/headers: Prepare to move the get_task_struct()/put_task_struct() and related APIs from <linux/sched.h> to <linux/sched/task.h>

2017-03-02 08:42:40 +01:00

parisc

Merge branch 'parisc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

2017-03-03 16:20:06 -08:00

parport

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

pci

Merge tag 'pci-v4.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2017-03-03 16:44:21 -08:00

pcmcia

…

perf

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>

2017-03-02 08:42:27 +01:00

phy

Merge tag 'pci-v4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2017-02-23 11:53:22 -08:00

pinctrl

scripts/spelling.txt: add "overrided" pattern and fix typo instances

2017-02-27 18:43:47 -08:00

platform

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/loadavg.h>

2017-03-02 08:42:27 +01:00

pnp

…

power

scripts/spelling.txt: add "intialization" pattern and fix typo instances

2017-02-27 18:43:47 -08:00

powercap

…

pps

…

ps3

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>

2017-03-02 08:42:29 +01:00

ptp

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2017-02-22 18:22:53 -08:00

pwm

Merge tag 'pwm/for-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2017-03-01 09:46:02 -08:00

rapidio

rapidio: use get_user_pages_unlocked()

2017-02-27 18:43:45 -08:00

ras

…

regulator

Merge tag 'regulator-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

2017-02-20 17:23:57 -08:00

remoteproc

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2017-03-02 13:53:13 -08:00

reset

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-02-23 15:57:04 -08:00

rpmsg

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2017-03-02 13:53:13 -08:00

rtc

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

s390

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

sbus

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2017-03-03 21:36:56 -08:00

sfi

…

sh

…

sn

…

soc

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

spi

sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h>

2017-03-02 08:42:27 +01:00

spmi

…

ssb

…

staging

atomisp2: unify some ifdef cases caused by format changes

2017-03-06 12:31:17 +01:00

target

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

tc

…

thermal

sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h>

2017-03-02 08:42:27 +01:00

thunderbolt

…

tty

sched/headers: Prepare to move the get_task_struct()/put_task_struct() and related APIs from <linux/sched.h> to <linux/sched/task.h>

2017-03-02 08:42:40 +01:00

uio

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

usb

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

uwb

…

vfio

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>

2017-03-02 08:42:29 +01:00

vhost

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

video

sched/headers: Remove the <linux/mm_types.h> dependency from <linux/sched.h>

2017-03-03 01:45:16 +01:00

virt

…

virtio

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

vlynq

…

vme

…

w1

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>

2017-03-02 08:42:29 +01:00

watchdog

watchdog: retu: restore MFD dependency

2017-03-01 06:15:10 -08:00

xen

sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>

2017-03-02 08:42:31 +01:00

zorro

…

Kconfig

…

Makefile

Merge tag 'pci-v4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2017-02-23 11:53:22 -08:00