diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-08 04:17:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-08 04:17:15 -0500 |
| commit | 8a103df440afea30c91ebd42e61dc644e647f4bd (patch) | |
| tree | 2cfa99e9c6e1e138e1404bce4294e46cb0034cce /include/linux/ulpi | |
| parent | a9903f04e0a4ea522d959c2f287cdf0ab029e324 (diff) | |
| parent | fbc3edf7d7731d7a22c483c679700589bab936a3 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/ulpi')
| -rw-r--r-- | include/linux/ulpi/driver.h | 1 | ||||
| -rw-r--r-- | include/linux/ulpi/interface.h | 1 | ||||
| -rw-r--r-- | include/linux/ulpi/regs.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ulpi/driver.h b/include/linux/ulpi/driver.h index a7af21a55248..c7a1810373e3 100644 --- a/include/linux/ulpi/driver.h +++ b/include/linux/ulpi/driver.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LINUX_ULPI_DRIVER_H | 2 | #ifndef __LINUX_ULPI_DRIVER_H |
| 2 | #define __LINUX_ULPI_DRIVER_H | 3 | #define __LINUX_ULPI_DRIVER_H |
| 3 | 4 | ||
diff --git a/include/linux/ulpi/interface.h b/include/linux/ulpi/interface.h index a2011a919eb6..e93cfa36c3f7 100644 --- a/include/linux/ulpi/interface.h +++ b/include/linux/ulpi/interface.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LINUX_ULPI_INTERFACE_H | 2 | #ifndef __LINUX_ULPI_INTERFACE_H |
| 2 | #define __LINUX_ULPI_INTERFACE_H | 3 | #define __LINUX_ULPI_INTERFACE_H |
| 3 | 4 | ||
diff --git a/include/linux/ulpi/regs.h b/include/linux/ulpi/regs.h index b5b8b8804560..9f607872b2f8 100644 --- a/include/linux/ulpi/regs.h +++ b/include/linux/ulpi/regs.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | #ifndef __LINUX_ULPI_REGS_H | 2 | #ifndef __LINUX_ULPI_REGS_H |
| 2 | #define __LINUX_ULPI_REGS_H | 3 | #define __LINUX_ULPI_REGS_H |
| 3 | 4 | ||