From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jan 2012 20:18:17 +0000 (-0800)
Subject: Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=12e55508921865aefdd80fd17afe70c191afbd1b;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'staging-next' of git://git./linux/kernel/git/gregkh/staging

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)
  net/hyperv: Add support for jumbo frame up to 64KB
  net/hyperv: Add NETVSP protocol version negotiation
  net/hyperv: Remove unnecessary kmap_atomic in netvsc driver
  staging/rtl8192e: Register against lib80211
  staging/rtl8192e: Convert to lib80211_crypt_info
  staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
  staging/rtl8192e: Add lib80211.h to rtllib.h
  staging/mei: add watchdog device registration wrappers
  drm/omap: GEM, deal with cache
  staging: vt6656: int.c, int.h: Change return of function to void
  staging: usbip: removed unused definitions from header
  staging: usbip: removed dead code from receive function
  staging:iio: Drop {mark,unmark}_in_use callbacks
  staging:iio: Drop buffer mark_param_change callback
  staging:iio: Drop the unused buffer enable() and is_enabled() callbacks
  staging:iio: Drop buffer busy flag
  staging:iio: Make sure a device is only opened once at a time
  staging:iio: Disallow modifying buffer size when buffer is enabled
  staging:iio: Disallow changing scan elements in all buffered modes
  staging:iio: Use iio_buffer_enabled instead of open coding it
  ...

Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of
module_init due to using module_i2c_driver() helper, next to removal of
MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).
---

12e55508921865aefdd80fd17afe70c191afbd1b
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");
diff --cc drivers/staging/iio/gyro/adxrs450_core.c
index 70fd468b6850,61690e26f22d..15e2496f70c8
--- a/drivers/staging/iio/gyro/adxrs450_core.c
+++ b/drivers/staging/iio/gyro/adxrs450_core.c
@@@ -380,9 -427,21 +427,10 @@@ static struct spi_driver adxrs450_drive
  	},
  	.probe = adxrs450_probe,
  	.remove = __devexit_p(adxrs450_remove),
+ 	.id_table	= adxrs450_id,
  };
 -
 -static __init int adxrs450_init(void)
 -{
 -	return spi_register_driver(&adxrs450_driver);
 -}
 -module_init(adxrs450_init);
 -
 -static __exit void adxrs450_exit(void)
 -{
 -	spi_unregister_driver(&adxrs450_driver);
 -}
 -module_exit(adxrs450_exit);
 +module_spi_driver(adxrs450_driver);
  
  MODULE_AUTHOR("Cliff Cai <cliff.cai@xxxxxxxxxx>");
- MODULE_DESCRIPTION("Analog Devices ADXRS450 Gyroscope SPI driver");
+ MODULE_DESCRIPTION("Analog Devices ADXRS450/ADXRS453 Gyroscope SPI driver");
  MODULE_LICENSE("GPL v2");