From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Apr 2013 04:43:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: next-20130404~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4346a23bbdcb57ca4e92ad9906d5d56723dada06;p=karo-tx-linux.git

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

Conflicts:
	drivers/staging/ccg/f_fs.c
	drivers/staging/ccg/rndis.c
	drivers/staging/dgrp/dgrp_dpa_ops.c
	drivers/staging/dgrp/dgrp_mon_ops.c
	drivers/staging/dgrp/dgrp_net_ops.c
	drivers/staging/dgrp/dgrp_ports_ops.c
	drivers/staging/dgrp/dgrp_specproc.c
---

4346a23bbdcb57ca4e92ad9906d5d56723dada06
diff --cc drivers/staging/gdm72xx/netlink_k.c
index c1239aaa6282,8a92605adbff..af7f1c1d0b5c
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@@ -15,9 -15,10 +15,10 @@@
  
  #include <linux/module.h>
  #include <linux/etherdevice.h>
 -#include <linux/netlink.h>
 +#include <net/netlink.h>
  #include <asm/byteorder.h>
  #include <net/sock.h>
+ #include "netlink_k.h"
  
  #if !defined(NLMSG_HDRLEN)
  #define NLMSG_HDRLEN	 ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
diff --cc drivers/staging/rts5139/rts51x_scsi.h
index c2446d02d328,3a5213611d21..1a0d70566186
--- a/drivers/staging/rts5139/rts51x_scsi.h
+++ b/drivers/staging/rts5139/rts51x_scsi.h
@@@ -147,9 -147,10 +147,8 @@@ struct scsi_cmnd
  
  int slave_alloc(struct scsi_device *sdev);
  int slave_configure(struct scsi_device *sdev);
 -int proc_info(struct Scsi_Host *host, char *buffer,
 -	      char **start, off_t offset, int length, int inout);
  int queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
  int command_abort(struct scsi_cmnd *srb);
- int device_reset(struct scsi_cmnd *srb);
  int bus_reset(struct scsi_cmnd *srb);
  
  #endif /* __RTS51X_SCSI_H */