diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-15 16:00:02 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-15 16:00:02 -0400 |
| commit | 1a63c353c856c9f6d44a533afb6ad6dbbcdea683 (patch) | |
| tree | a51c18f01c031a21f07ec3be07ffae210bb9adc7 /include/linux | |
| parent | 7662ff46b7b3678162ce125903115e4ab0607a2d (diff) | |
| parent | b3c0598952e02f1f1f6d003574549d940ecbf31a (diff) | |
| download | op-kernel-dev-1a63c353c856c9f6d44a533afb6ad6dbbcdea683.zip op-kernel-dev-1a63c353c856c9f6d44a533afb6ad6dbbcdea683.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 into for-davem
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 33b2ea0..a36ab3b 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -18,6 +18,7 @@ #define SDIO_CLASS_PHS 0x06 /* PHS standard interface */ #define SDIO_CLASS_WLAN 0x07 /* WLAN interface */ #define SDIO_CLASS_ATA 0x08 /* Embedded SDIO-ATA std interface */ +#define SDIO_CLASS_BT_AMP 0x09 /* Type-A Bluetooth AMP interface */ /* * Vendors and devices. Sort key: vendor first, device next. |
