summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/52-tty-dev
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-04-05 00:29:26 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-04-05 00:29:26 +0200
commit30498b130cc0476e73f5142dcc63bc271da2d89b (patch)
tree4719208b11adb08bf484867024642b2f8464d0b4 /patches/collateral-evolutions/network/52-tty-dev
parenta7a2e992aa2e563c8adb2dec6ddd6e53b1cd9872 (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/52-tty-dev')
-rw-r--r--patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch b/patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch
index 0d4cd779..3ff960d9 100644
--- a/patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch
+++ b/patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch
@@ -1,6 +1,6 @@
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
-@@ -421,7 +421,10 @@
+@@ -421,7 +421,10 @@ static int hci_uart_register_dev(struct
hdev->close = hci_uart_close;
hdev->flush = hci_uart_flush;
hdev->send = hci_uart_send_frame;