Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / slicoss / oasisdbgdownload.h

diff --git a/drivers/staging/slicoss/oasisdbgdownload.h b/drivers/staging/slicoss/oasisdbgdownload.h
index cae5d55d28567887c215b66f9ed17bda089cfcfe..519e00797d441f7149457b767b371c02a791c8e4 100644 (file)
--- a/drivers/staging/slicoss/oasisdbgdownload.h
+++ b/drivers/staging/slicoss/oasisdbgdownload.h
@@ -1,14 +1,14 @@
-#define OASIS_UCODE_VERS_STRING        "$Revision: 1.2 $"
-#define OASIS_UCODE_VERS_DATE          "$Date: 2006/03/27 15:11:22 $"
+#define OASIS_UCODE_VERS_STRING        "1.2"
+#define OASIS_UCODE_VERS_DATE          "2006/03/27 15:11:22"
 #define OASIS_UCODE_HOSTIF_ID          3
 
-static LONG    ONumSections = 0x2;
-static ULONG   OSectionSize[] =
+static s32 ONumSections = 0x2;
+static u32 OSectionSize[] =
 {
        0x00004000, 0x00010000,
 };
 
-static ULONG   OSectionStart[] =
+static u32 OSectionStart[] =
 {
        0x00000000, 0x00008000,
 };