From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Nov 2015 02:36:14 +0000 (+1100)
Subject: Merge remote-tracking branch 'usb/usb-next'
X-Git-Tag: KARO-TX6UL-2015-11-03~36
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=3436832a44981e7362ad7b7c4828990c96f52781

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

3436832a44981e7362ad7b7c4828990c96f52781
diff --cc include/linux/platform_data/atmel.h
index e649d8d370f8,9127ebbaa487..3c8825b67298
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@@ -9,17 -9,22 +9,8 @@@
  
  #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
 -#include <linux/device.h>
 -#include <linux/i2c.h>
 -#include <linux/leds.h>
 -#include <linux/spi/spi.h>
 -#include <linux/usb/atmel_usba_udc.h>
 -#include <linux/atmel-mci.h>
 -#include <sound/atmel-ac97c.h>
  #include <linux/serial.h>
 -#include <linux/platform_data/macb.h>
 -
 -/*
 - * at91: 6 USARTs and one DBGU port (SAM9260)
 - * avr32: 4
 - */
 -#define ATMEL_MAX_UART	7
  
-  /* USB Device */
- struct at91_udc_data {
- 	int	vbus_pin;		/* high == host powering us */
- 	u8	vbus_active_low;	/* vbus polarity */
- 	u8	vbus_polled;		/* Use polling, not interrupt */
- 	int	pullup_pin;		/* active == D+ pulled up */
- 	u8	pullup_active_low;	/* true == pullup_pin is active low */
- };
- 
   /* Compact Flash */
  struct at91_cf_data {
  	int	irq_pin;		/* I/O IRQ */