From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933731Ab1D2THm (ORCPT ); Fri, 29 Apr 2011 15:07:42 -0400 Received: from kroah.org ([198.145.64.141]:51379 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932921Ab1D2THk (ORCPT ); Fri, 29 Apr 2011 15:07:40 -0400 Date: Fri, 29 Apr 2011 12:07:30 -0700 From: Greg KH To: Linus Torvalds , Andrew Morton Cc: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org Subject: [GIT PATCH] STAGING fixes for .39 Message-ID: <20110429190730.GA13635@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Here are a number of minor staging driver fixes for your .39-rc tree. Almost all of these fix build errors that have been reported by people. There is one usbip bugfix for a runtime issue as well. Please pull from: master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/ staging-linus All of these patches have been in the mm and -next trees for a while. These patches will be sent to the linux driver project list for all to see. thanks, greg k-h -------------- drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 ---- drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 3 --- drivers/staging/gma500/Kconfig | 2 +- drivers/staging/intel_sst/intelmid_v1_control.c | 1 + drivers/staging/intel_sst/intelmid_v2_control.c | 1 + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 1 + drivers/staging/rts_pstor/debug.h | 2 +- drivers/staging/rts_pstor/ms.c | 1 + drivers/staging/rts_pstor/rtsx_chip.c | 5 +++-- drivers/staging/rts_pstor/rtsx_scsi.c | 1 + drivers/staging/rts_pstor/sd.c | 4 ++-- drivers/staging/rts_pstor/trace.h | 2 +- drivers/staging/rts_pstor/xd.c | 1 + drivers/staging/solo6x10/Kconfig | 1 + drivers/staging/usbip/vhci_hcd.c | 9 ++++----- drivers/staging/usbip/vhci_sysfs.c | 7 ++++--- 16 files changed, 23 insertions(+), 22 deletions(-) --------------- Jeff Mahoney (5): staging: olpc: Add staging: gma500: Depend on X86 staging: rts_pstor: Add staging: rts_pstor: use #ifdef instead of #if staging: ft1000: Remove unnecessary EXPORT_SYMBOLs Max Vozeler (1): staging: usbip: vhci: fix oops on subsequent attach Peter Foley (1): staging: solo6x10: add select SND_PCM to fix build error Randy Dunlap (1): staging: intel_sst: intelmid needs delay.h