diff options
| author |   Brian Norris <computersforpeace@gmail.com> | 2017-02-08 15:00:24 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-02-08 15:00:24 -0800 |
| commit | 9c8d7ff32a0aa001ac8506180e1662ecdf927f32 (patch) | |
| tree | 65f44bde4c200c7485479d59df550815371c0ab0 /include/linux/phy.h | |
| parent | mtd: Fix typo: "occured" -> "occurred" (diff) | |
| parent | mtd: nand: Add Winbond manufacturer id (diff) | |
Merge tag 'nand/for-4.11' of github.com:linux-nand/linux
From Boris:
"""
This pull request contains minor fixes/improvements on existing drivers:
- sunxi: avoid busy-waiting for NAND events
- ifc: fix ECC handling on IFC v1.0
- OX820: add explicit dependency on ARCH_OXNAS in Kconfig
- core: add a new manufacture ID and fix a kernel-doc warning
- fsmc: kill pdata support
- lpc32xx_slc: remove unneeded NULL check
"""
Conflicts:
include/linux/mtd/nand.h
[Brian: trivial conflict in the comment section]
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index f7d95f644eed..7fc1105605bf 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -25,7 +25,6 @@ #include <linux/timer.h> #include <linux/workqueue.h> #include <linux/mod_devicetable.h> -#include <linux/phy_led_triggers.h> #include <linux/atomic.h> |