diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-07 08:49:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-07 08:49:17 +0100 |
| commit | 87a8d03266a55f18f31fdb71c28a8dcffe39124d (patch) | |
| tree | ab337ca060871296a8dc5d47fcd45da9dcb17a3a /include/linux/phy.h | |
| parent | 696204faa6e8a318320ebb49d9fa69bc8275644d (diff) | |
| parent | d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c (diff) | |
Merge tag 'v4.10-rc7' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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> |