2003-05-23 20:10:50

by Eduardo Pereira Habkost

[permalink] [raw]
Subject: [PATCH] Fix UCODE macro definition on ambassador driver


When compiling the ambassador driver, gcc 3.3 gives the following
error:
drivers/atm/ambassador.c:301:21: pasting "." and "start" does not give a valid preprocessing token

The following patch fixes that.

--
Eduardo

diff -purN linux-2.4.orig/drivers/atm/ambassador.c linux-2.4/drivers/atm/ambassador.c
--- linux-2.4.orig/drivers/atm/ambassador.c 2003-05-22 20:12:26.000000000 -0300
+++ linux-2.4/drivers/atm/ambassador.c 2003-05-22 20:12:26.000000000 -0300
@@ -290,12 +290,11 @@ static inline void __init show_version (
/********** microcode **********/

#ifdef AMB_NEW_MICROCODE
-#define UCODE(x) UCODE1(atmsar12.,x)
+#define UCODE(x) UCODE1(atmsar12.x)
#else
-#define UCODE(x) UCODE1(atmsar11.,x)
+#define UCODE(x) UCODE1(atmsar11.x)
#endif
-#define UCODE2(x) #x
-#define UCODE1(x,y) UCODE2(x ## y)
+#define UCODE1(x) #x

static u32 __initdata ucode_start =
#include UCODE(start)


Attachments:
(No filename) (895.00 B)
(No filename) (189.00 B)
Download all attachments