tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 into for-davem

Browse Source
This commit is contained in:
John W. Linville
2010-10-15 16:00:02 -04:00
parent 7662ff46b7 b3c0598952
commit 1a63c353c8
19 changed files with 218 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/mmc/sdio_ids.h
+1
View File
@@ -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.