Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-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 4d67a5e82c8311ee39508b817a78c307f22d1567..3c8825b67298fafe60f22c803206f9f0789fc8f7 100644 (file)
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -11,21 +11,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/serial.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 */
@@ -66,11 +51,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);