Merge remote-tracking branch 'spi/topic/s3c64xx' into spi-loop

2013-10-11 20:10:13 +01:00
parent b158935f70 ebd805cc14
commit 2cc6e2e0c8
5 changed files with 98 additions and 50 deletions
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -462,6 +462,8 @@ extern struct spi_master *
 spi_alloc_master(struct device *host, unsigned size);

 extern int spi_register_master(struct spi_master *master);
+extern int devm_spi_register_master(struct device *dev,
+				    struct spi_master *master);
 extern void spi_unregister_master(struct spi_master *master);

 extern struct spi_master *spi_busnum_to_master(u16 busnum);