diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
commit | 30498b130cc0476e73f5142dcc63bc271da2d89b (patch) | |
tree | 4719208b11adb08bf484867024642b2f8464d0b4 /patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch | |
parent | a7a2e992aa2e563c8adb2dec6ddd6e53b1cd9872 (diff) |
refresh patches against next-20130328
The patches were last refreshed against that same tree,
so the only change is that now we have -p in there, which
results in changes like this (only):
-@@ -1593,7 +1593,7 @@
+@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_
This makes the patches more readable.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch')
-rw-r--r-- | patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch index 56b25bd7..d35eaad2 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c -@@ -140,7 +140,11 @@ +@@ -140,7 +140,11 @@ static void btuart_write_wakeup(btuart_i } do { @@ -12,7 +12,7 @@ register struct sk_buff *skb; int len; -@@ -181,7 +185,11 @@ +@@ -181,7 +185,11 @@ static void btuart_receive(btuart_info_t return; } @@ -24,7 +24,7 @@ do { info->hdev->stat.byte_rx++; -@@ -295,7 +303,11 @@ +@@ -295,7 +303,11 @@ static irqreturn_t btuart_interrupt(int /* our irq handler is shared */ return IRQ_NONE; @@ -36,7 +36,7 @@ spin_lock(&(info->lock)); -@@ -352,7 +364,11 @@ +@@ -352,7 +364,11 @@ static void btuart_change_speed(btuart_i return; } @@ -48,7 +48,7 @@ spin_lock_irqsave(&(info->lock), flags); -@@ -471,7 +487,11 @@ +@@ -471,7 +487,11 @@ static int btuart_hci_ioctl(struct hci_d static int btuart_open(btuart_info_t *info) { unsigned long flags; @@ -60,7 +60,7 @@ struct hci_dev *hdev; spin_lock_init(&(info->lock)); -@@ -538,7 +558,11 @@ +@@ -538,7 +558,11 @@ static int btuart_open(btuart_info_t *in static int btuart_close(btuart_info_t *info) { unsigned long flags; @@ -72,7 +72,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -574,8 +598,27 @@ +@@ -574,8 +598,27 @@ static int btuart_probe(struct pcmcia_de info->p_dev = link; link->priv = info; @@ -100,7 +100,7 @@ return btuart_config(link); } -@@ -586,6 +629,7 @@ +@@ -586,6 +629,7 @@ static void btuart_detach(struct pcmcia_ btuart_release(link); } @@ -108,7 +108,7 @@ static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data) { int *try = priv_data; -@@ -624,6 +668,63 @@ +@@ -624,6 +668,63 @@ static int btuart_check_config_notpicky( } return -ENODEV; } @@ -172,7 +172,7 @@ static int btuart_config(struct pcmcia_device *link) { -@@ -647,9 +748,15 @@ +@@ -647,9 +748,15 @@ static int btuart_config(struct pcmcia_d goto failed; found_port: @@ -188,7 +188,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -683,7 +790,13 @@ +@@ -683,7 +790,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids); static struct pcmcia_driver btuart_driver = { .owner = THIS_MODULE, |