Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5895198c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c
  staging: intel_sst: intelmid needs delay.h
  staging: solo6x10: add select SND_PCM to fix build error
  staging: usbip: vhci: fix oops on subsequent attach
  staging: ft1000: Remove unnecessary EXPORT_SYMBOLs
  staging: rts_pstor: use #ifdef instead of #if
  staging: rts_pstor: Add <linux/vmalloc.h>
  staging: gma500: Depend on X86
  staging: olpc: Add <linux/delay.h>
parents 0ecb063a 9005fcd8

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -2288,7 +2288,3 @@ err_dev: 
	free_netdev(dev);

	free_netdev(dev);

	return NULL;

	return NULL;

}
 
}
 


EXPORT_SYMBOL(init_ft1000_card);

EXPORT_SYMBOL(stop_ft1000_card);

EXPORT_SYMBOL(flarion_ft1000_cnt);

drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -214,6 +214,3 @@ void ft1000CleanupProc(struct net_device *dev) 
	remove_proc_entry(FT1000_PROC, init_net.proc_net);

	remove_proc_entry(FT1000_PROC, init_net.proc_net);

	unregister_netdevice_notifier(&ft1000_netdev_notifier);

	unregister_netdevice_notifier(&ft1000_netdev_notifier);

}
 
}
 


EXPORT_SYMBOL(ft1000InitProc);

EXPORT_SYMBOL(ft1000CleanupProc);

drivers/staging/gma500/Kconfig

+1 −1
Original line number Original line Diff line number Diff line 
config DRM_PSB

config DRM_PSB

	tristate "Intel GMA500 KMS Framebuffer"

	tristate "Intel GMA500 KMS Framebuffer"

	depends on DRM && PCI

	depends on DRM && PCI && X86

	select FB_CFB_COPYAREA

	select FB_CFB_COPYAREA

        select FB_CFB_FILLRECT

        select FB_CFB_FILLRECT

        select FB_CFB_IMAGEBLIT

        select FB_CFB_IMAGEBLIT

drivers/staging/intel_sst/intelmid_v1_control.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt





#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/delay.h>

#include <linux/file.h>

#include <linux/file.h>

#include <asm/mrst.h>

#include <asm/mrst.h>

#include <sound/pcm.h>

#include <sound/pcm.h>

drivers/staging/intel_sst/intelmid_v2_control.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt





#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/delay.h>

#include <linux/file.h>

#include <linux/file.h>

#include "intel_sst.h"

#include "intel_sst.h"

#include "intelmid_snd_control.h"

#include "intelmid_snd_control.h"