Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac

[pandora-kernel.git] / drivers / firewire / nosy-user.h

diff --git a/drivers/firewire/nosy-user.h b/drivers/firewire/nosy-user.h
index c9a1682..e48aa62 100644 (file)
--- a/drivers/firewire/nosy-user.h
+++ b/drivers/firewire/nosy-user.h
@@ -1,8 +1,8 @@
 #ifndef __nosy_user_h
 #define __nosy_user_h
 
-#include <asm/ioctl.h>
-#include <asm/types.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
 
 #define NOSY_IOC_GET_STATS _IOR('&', 0, struct nosy_stats)
 #define NOSY_IOC_START     _IO('&', 1)
@@ -10,16 +10,16 @@
 #define NOSY_IOC_FILTER    _IOW('&', 2, __u32)
 
 struct nosy_stats {
-  __u32 total_packet_count;
-  __u32 lost_packet_count;
+       __u32 total_packet_count;
+       __u32 lost_packet_count;
 };
 
-/* 
+/*
  * Format of packets returned from the kernel driver:
  *
- *   quadlet with timestamp (microseconds)
- *   quadlet padded packet data...
- *   quadlet with ack
+ *     quadlet with timestamp          (microseconds, CPU endian)
+ *     quadlet-padded packet data...   (little endian)
+ *     quadlet with ack                (little endian)
  */
 
 #endif /* __nosy_user_h */