kernel: refresh patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43138
This commit is contained in:
parent
e1078da32a
commit
553ed34def
2 changed files with 4 additions and 9 deletions
|
@ -311,11 +311,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
drivers/net/usb/hso.c | 1 +
|
drivers/net/usb/hso.c | 1 +
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
|
|
||||||
index a364018..babda7d 100644
|
|
||||||
--- a/drivers/net/usb/hso.c
|
--- a/drivers/net/usb/hso.c
|
||||||
+++ b/drivers/net/usb/hso.c
|
+++ b/drivers/net/usb/hso.c
|
||||||
@@ -469,6 +469,7 @@ static const struct usb_device_id hso_ids[] = {
|
@@ -469,6 +469,7 @@ static const struct usb_device_id hso_id
|
||||||
{USB_DEVICE(0x0af0, 0x8800)},
|
{USB_DEVICE(0x0af0, 0x8800)},
|
||||||
{USB_DEVICE(0x0af0, 0x8900)},
|
{USB_DEVICE(0x0af0, 0x8900)},
|
||||||
{USB_DEVICE(0x0af0, 0x9000)},
|
{USB_DEVICE(0x0af0, 0x9000)},
|
||||||
|
@ -323,6 +321,3 @@ index a364018..babda7d 100644
|
||||||
{USB_DEVICE(0x0af0, 0xd035)},
|
{USB_DEVICE(0x0af0, 0xd035)},
|
||||||
{USB_DEVICE(0x0af0, 0xd055)},
|
{USB_DEVICE(0x0af0, 0xd055)},
|
||||||
{USB_DEVICE(0x0af0, 0xd155)},
|
{USB_DEVICE(0x0af0, 0xd155)},
|
||||||
--
|
|
||||||
1.8.4.5
|
|
||||||
|
|
||||||
|
|
|
@ -82,13 +82,13 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
+++ b/fs/yaffs2/yaffs_mtdif.c
|
+++ b/fs/yaffs2/yaffs_mtdif.c
|
||||||
@@ -16,6 +16,7 @@
|
@@ -16,6 +16,7 @@
|
||||||
#include "yaffs_mtdif.h"
|
#include "yaffs_mtdif.h"
|
||||||
|
|
||||||
#include "linux/mtd/mtd.h"
|
#include "linux/mtd/mtd.h"
|
||||||
+#include "uapi/linux/major.h"
|
+#include "uapi/linux/major.h"
|
||||||
#include "linux/types.h"
|
#include "linux/types.h"
|
||||||
#include "linux/time.h"
|
#include "linux/time.h"
|
||||||
#include "linux/mtd/nand.h"
|
#include "linux/mtd/nand.h"
|
||||||
@@ -277,7 +277,8 @@ struct mtd_info * yaffs_get_mtd_device(d
|
@@ -276,7 +277,8 @@ struct mtd_info * yaffs_get_mtd_device(d
|
||||||
return mtd;
|
return mtd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
{
|
{
|
||||||
if (yaffs_version == 2) {
|
if (yaffs_version == 2) {
|
||||||
if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
|
if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
|
||||||
@@ -296,6 +297,12 @@ int yaffs_verify_mtd(struct mtd_info *mt
|
@@ -295,6 +297,12 @@ int yaffs_verify_mtd(struct mtd_info *mt
|
||||||
);
|
);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue