Merge tag 'usb-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[cascardo/linux.git] / include / linux / platform_data / atmel.h

diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
index 527a85c..bdc0ee8 100644 (file)
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -25,15 +25,6 @@
  */
 #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 */
@@ -74,11 +65,6 @@ struct atmel_uart_data {
        struct serial_rs485     rs485;          /* rs485 settings */
 };
 
-/* CAN */
-struct at91_can_data {
-       void (*transceiver_switch)(int on);
-};
-
 /* FIXME: this needs a better location, but gets stuff building again */
 extern int at91_suspend_entering_slow_clock(void);