Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / arch / ppc / syslib / virtex_devices.h

diff --git a/arch/ppc/syslib/virtex_devices.h b/arch/ppc/syslib/virtex_devices.h
index 4a17dd3927c133ce7fdac31a04a4836c965295fd..6ebd9b4b8f1c92e0586f02a81485646883df0cee 100644 (file)
--- a/arch/ppc/syslib/virtex_devices.h
+++ b/arch/ppc/syslib/virtex_devices.h
@@ -12,6 +12,7 @@
 #define __ASM_VIRTEX_DEVICES_H__
 
 #include <linux/platform_device.h>
+#include <linux/xilinxfb.h>
 
 void __init virtex_early_serial_map(void);
 
@@ -24,4 +25,11 @@ void __init virtex_early_serial_map(void);
  */
 int virtex_device_fixup(struct platform_device *dev);
 
+/* SPI Controller IP */
+struct xspi_platform_data {
+       s16 bus_num;
+       u16 num_chipselect;
+       u32 speed_hz;
+};
+
 #endif  /* __ASM_VIRTEX_DEVICES_H__ */