diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 21:47:41 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 21:47:41 +0100 |
commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
tree | bc16200f3b6ea150b298422754e32959eaa339bc /include/net/bluetooth/rfcomm.h | |
parent | driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq() (diff) | |
parent | macb: allow GEM to have configurable receive buffer size (diff) | |
download | linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.tar.xz linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.zip |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'include/net/bluetooth/rfcomm.h')
-rw-r--r-- | include/net/bluetooth/rfcomm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index d5eee2093b1e..e2e3ecad1008 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h @@ -211,6 +211,7 @@ struct rfcomm_dlc { #define RFCOMM_AUTH_ACCEPT 6 #define RFCOMM_AUTH_REJECT 7 #define RFCOMM_DEFER_SETUP 8 +#define RFCOMM_ENC_DROP 9 /* Scheduling flags and events */ #define RFCOMM_SCHED_WAKEUP 31 |