kernel: Refresh kernel patches
No manual changes needed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
aa237757e0
commit
41fa086e6f
4 changed files with 11 additions and 11 deletions
|
@ -13,9 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
||||||
|
|
||||||
--- a/drivers/leds/Kconfig
|
--- a/drivers/leds/Kconfig
|
||||||
+++ b/drivers/leds/Kconfig
|
+++ b/drivers/leds/Kconfig
|
||||||
@@ -929,6 +929,17 @@ config LEDS_ACER_A500
|
@@ -931,6 +931,17 @@ config LEDS_ACER_A500
|
||||||
This option enables support for the Power Button LED of
|
|
||||||
Acer Iconia Tab A500.
|
source "drivers/leds/blink/Kconfig"
|
||||||
|
|
||||||
+config LEDS_RESET
|
+config LEDS_RESET
|
||||||
+ tristate "LED support for reset-controller API"
|
+ tristate "LED support for reset-controller API"
|
||||||
|
|
|
@ -244,7 +244,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||||
static int bcm2708_fb_register(struct bcm2708_fb *fb)
|
static int bcm2708_fb_register(struct bcm2708_fb *fb)
|
||||||
--- a/drivers/video/fbdev/core/fbmem.c
|
--- a/drivers/video/fbdev/core/fbmem.c
|
||||||
+++ b/drivers/video/fbdev/core/fbmem.c
|
+++ b/drivers/video/fbdev/core/fbmem.c
|
||||||
@@ -1085,6 +1085,30 @@ fb_blank(struct fb_info *info, int blank
|
@@ -1095,6 +1095,30 @@ fb_blank(struct fb_info *info, int blank
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(fb_blank);
|
EXPORT_SYMBOL(fb_blank);
|
||||||
|
|
||||||
|
@ -275,7 +275,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||||
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
|
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
|
||||||
unsigned long arg)
|
unsigned long arg)
|
||||||
{
|
{
|
||||||
@@ -1093,6 +1117,7 @@ static long do_fb_ioctl(struct fb_info *
|
@@ -1103,6 +1127,7 @@ static long do_fb_ioctl(struct fb_info *
|
||||||
struct fb_fix_screeninfo fix;
|
struct fb_fix_screeninfo fix;
|
||||||
struct fb_cmap cmap_from;
|
struct fb_cmap cmap_from;
|
||||||
struct fb_cmap_user cmap;
|
struct fb_cmap_user cmap;
|
||||||
|
@ -283,7 +283,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||||
void __user *argp = (void __user *)arg;
|
void __user *argp = (void __user *)arg;
|
||||||
long ret = 0;
|
long ret = 0;
|
||||||
|
|
||||||
@@ -1168,6 +1193,15 @@ static long do_fb_ioctl(struct fb_info *
|
@@ -1180,6 +1205,15 @@ static long do_fb_ioctl(struct fb_info *
|
||||||
unlock_fb_info(info);
|
unlock_fb_info(info);
|
||||||
console_unlock();
|
console_unlock();
|
||||||
break;
|
break;
|
||||||
|
@ -299,7 +299,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||||
default:
|
default:
|
||||||
lock_fb_info(info);
|
lock_fb_info(info);
|
||||||
fb = info->fbops;
|
fb = info->fbops;
|
||||||
@@ -1313,6 +1347,7 @@ static long fb_compat_ioctl(struct file
|
@@ -1325,6 +1359,7 @@ static long fb_compat_ioctl(struct file
|
||||||
case FBIOPAN_DISPLAY:
|
case FBIOPAN_DISPLAY:
|
||||||
case FBIOGET_CON2FBMAP:
|
case FBIOGET_CON2FBMAP:
|
||||||
case FBIOPUT_CON2FBMAP:
|
case FBIOPUT_CON2FBMAP:
|
||||||
|
|
|
@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
|
||||||
--- a/include/linux/netdev_features.h
|
--- a/include/linux/netdev_features.h
|
||||||
+++ b/include/linux/netdev_features.h
|
+++ b/include/linux/netdev_features.h
|
||||||
@@ -231,10 +231,10 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
|
@@ -231,10 +231,10 @@ static inline int find_next_netdev_featu
|
||||||
#define NETIF_F_UPPER_DISABLES NETIF_F_LRO
|
#define NETIF_F_UPPER_DISABLES NETIF_F_LRO
|
||||||
|
|
||||||
/* changeable features with no special hardware requirements */
|
/* changeable features with no special hardware requirements */
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
--- a/drivers/leds/Kconfig
|
--- a/drivers/leds/Kconfig
|
||||||
+++ b/drivers/leds/Kconfig
|
+++ b/drivers/leds/Kconfig
|
||||||
@@ -929,6 +929,16 @@ config LEDS_ACER_A500
|
@@ -931,6 +931,16 @@ config LEDS_ACER_A500
|
||||||
This option enables support for the Power Button LED of
|
|
||||||
Acer Iconia Tab A500.
|
source "drivers/leds/blink/Kconfig"
|
||||||
|
|
||||||
+config LEDS_UBNT_LEDBAR
|
+config LEDS_UBNT_LEDBAR
|
||||||
+ tristate "LED support for Ubiquiti UniFi 6 LR"
|
+ tristate "LED support for Ubiquiti UniFi 6 LR"
|
||||||
|
|
Loading…
Reference in a new issue