From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 05:59:11 +0000 (+1100)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: next-20111213~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0067bb50ae9064d722daabf4ba3e8446f5e58d8e;p=karo-tx-linux.git

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/hid/hid-hyperv.c
	drivers/staging/hv/Kconfig
	drivers/staging/hv/Makefile
	drivers/staging/iio/adc/ad799x_core.c
---

0067bb50ae9064d722daabf4ba3e8446f5e58d8e
diff --cc drivers/staging/iio/adc/ad799x_core.c
index c0d2f886ea2c,815e6b9a8d4b..d5b581d8bc2b
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@@ -934,4 -943,6 +934,3 @@@ module_i2c_driver(ad799x_driver)
  MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
  MODULE_DESCRIPTION("Analog Devices AD799x ADC");
  MODULE_LICENSE("GPL v2");
- MODULE_ALIAS("i2c:ad799x");
 -
 -module_init(ad799x_init);
 -module_exit(ad799x_exit);
diff --cc drivers/staging/iio/dac/ad5791.c
index 4a80fd822231,e919025f138a..ac45636a8d72
--- a/drivers/staging/iio/dac/ad5791.c
+++ b/drivers/staging/iio/dac/ad5791.c
@@@ -410,8 -413,19 +413,8 @@@ static struct spi_driver ad5791_driver 
  	.remove = __devexit_p(ad5791_remove),
  	.id_table = ad5791_id,
  };
 -
 -static __init int ad5791_spi_init(void)
 -{
 -	return spi_register_driver(&ad5791_driver);
 -}
 -module_init(ad5791_spi_init);
 -
 -static __exit void ad5791_spi_exit(void)
 -{
 -	spi_unregister_driver(&ad5791_driver);
 -}
 -module_exit(ad5791_spi_exit);
 +module_spi_driver(ad5791_driver);
  
  MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
- MODULE_DESCRIPTION("Analog Devices AD5760/AD5780/AD5781/AD5791 DAC");
+ MODULE_DESCRIPTION("Analog Devices AD5760/AD5780/AD5781/AD5790/AD5791 DAC");
  MODULE_LICENSE("GPL v2");