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

Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap

Browse Source 
Conflicts:
	sound/soc/omap/Kconfig
This commit is contained in:
Mark Brown
2013-08-15 11:37:38 +01:00
parent 8fe120b5a6 b7ae6f31d8
commit 743c5bb898
1469 changed files with 16070 additions and 101835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/platform_data/mmc-pxamci.h
+1 -1
View File
@@ -12,7 +12,7 @@ struct pxamci_platform_data {
unsigned long detect_delay_ms; /* delay in millisecond before detecting cards after interrupt */
int (*init)(struct device *, irq_handler_t , void *);
int (*get_ro)(struct device *);
void (*setpower)(struct device *, unsigned int);
int (*setpower)(struct device *, unsigned int);
void (*exit)(struct device *, void *);
int gpio_card_detect; /* gpio detecting card insertion */
int gpio_card_ro; /* gpio detecting read only toggle */