Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits) staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register. staging:iio:kfifo_buf fix double initialization of the ring device structure. staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata. staging:iio:imu fix missing register table index for some channels spectra: enable device before poking it staging: rts_pstor: Fix a miswriting staging/lirc_bt829: Return -ENODEV when no hardware is found. staging/lirc_parallel: remove pointless prototypes. staging/lirc_parallel: fix panic on rmmod staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata. Staging: zram: Fix kunmapping order Revert "gma500: Fix dependencies" gma500: Add medfield header gma500: wire up the mrst i2c bus from chip_info gma500: Fix DPU build gma500: Clean up the DPU config and make it runtime gma500: resync with Medfield progress gma500: Use the mrst helpers and power control for mode commit gma500@ Fix backlight range error gma500: More Moorestown muddle meddling means MM maybe might modeset ... Fix up fairly trivial conflicts all over, mostly due to header file cleanup conflicts, but some deleted files and some just context changes: - Documentation/feature-removal-schedule.txt - drivers/staging/bcm/headers.h - drivers/staging/brcm80211/brcmfmac/dhd_linux.c - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h - drivers/staging/brcm80211/brcmfmac/wl_iw.c - drivers/staging/et131x/et131x_netdev.c - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c - drivers/staging/rtl8192e/r8192E.h - drivers/staging/usbip/userspace/src/utils.h

Linus Torvalds committed 15 years ago

Commit 13805162 parents d5ef642 e1703b3797 files · +49665 −188042Browse files

Showing the changes to drivers/staging/lirc (4 of 797 files). Show all

Unified · Split

4 files

drivers/staging/lirc/lirc_bt829.c +2 −2
drivers/staging/lirc/lirc_parallel.c +3 −3
drivers/staging/lirc/lirc_ttusbir.c +0 −1
drivers/staging/lirc/lirc_zilog.c +0 −2

drivers/staging/lirc/lirc_bt829.c+2−2

@@ -122,10 +122,10 @@ int init_module(void) · 121 unmodified lines
122	122
123	123	pdev = do_pci_probe();
124	124	if (pdev == NULL)
125		− return 1;
	125	+ return -ENODEV;
126	126
127	127	if (!atir_init_start())
128		− return 1;
	128	+ return -ENODEV;
129	129
130	130	strcpy(atir_driver.name, "ATIR");
131	131	atir_driver.minor = -1;

drivers/staging/lirc/lirc_parallel.c+3−3

@@ -615,9 +615,6 @@ static struct platform_driver lirc_parallel_driver = { · 614 unmodified lines
615	615	},
616	616	};
617	617
618		−static int pf(void *handle);
619		−static void kf(void *handle);
620		−
621	618	static int pf(void *handle)
622	619	{
623	620	parport_disable_irq(pport);
@@ -730,6 +727,9 @@ static void __exit lirc_parallel_exit(void) · 106 unmodified lines
730	727	{
731	728	parport_unregister_device(ppdevice);
732	729	lirc_unregister_driver(driver.minor);
	730	+
	731	+ platform_device_unregister(lirc_parallel_dev);
	732	+ platform_driver_unregister(&lirc_parallel_driver);
733	733	}
734	734
735	735	module_init(lirc_parallel_init);

drivers/staging/lirc/lirc_ttusbir.c+0−1

@@ -30,7 +30,6 @@ · 29 unmodified lines
30	30	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
31	31	*/
32	32
33		−#include <linux/version.h>
34	33	#include <linux/kernel.h>
35	34	#include <linux/init.h>
36	35	#include <linux/module.h>

drivers/staging/lirc/lirc_zilog.c+0−2

@@ -39,8 +39,6 @@ · 38 unmodified lines
39	39	*
40	40	*/
41	41
42		−
43		−#include <linux/version.h>
44	42	#include <linux/module.h>
45	43	#include <linux/kmod.h>
46	44	#include <linux/kernel.h>