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

[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 c4bc90bfebe0b7904c91f3ed27a4c2a8b56bd935..e649d8d370f8954435b79728e95db462795add5f 100644 (file)
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -9,15 +9,7 @@
 
 #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>
 
  /* USB Device */
 struct at91_udc_data {
@@ -68,11 +60,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);