drivers/net/usb/hso.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
-diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
-index cba1d46..5fb36ed 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
-@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interface *interface,
+@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interfac
struct hso_shared_int *shared_int;
struct hso_device *tmp_dev = NULL;
if_num = interface->altsetting->desc.bInterfaceNumber;
/* Get the interface/port specification from either driver_info or from
-@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interface *interface,
+@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interfac
else
port_spec = hso_get_config_data(interface);
/* Check if we need to switch to alt interfaces prior to port
* configuration */
if (interface->num_altsetting > 1)
---
-1.7.9.5
-
drivers/net/usb/hso.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
-index 5fb36ed..86292e6 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2816,13 +2816,16 @@ exit:
return -EIO;
}
-@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct usb_interface *interface)
+@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct us
if (config_data[16] & 0x1)
result |= HSO_INFO_CRC_BUG;
return result;
}
---
-1.7.9.5
-
---
(limited to 'arch/arm/kernel/fiq.c')
-diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
-index 25442f4..fc79202 100644
--- a/arch/arm/kernel/fiq.c
+++ b/arch/arm/kernel/fiq.c
-@@ -84,17 +84,13 @@ int show_fiq_list(struct seq_file *p, int prec)
+@@ -84,17 +84,13 @@ int show_fiq_list(struct seq_file *p, in
void set_fiq_handler(void *start, unsigned int length)
{
}
int claim_fiq(struct fiq_handler *f)
---
-cgit v0.9.2
-