Messages in this thread Patches in this message | | | Subject | [PATCH 2.5] Enable ALIGN #undef for drivers/net/defxx.c | From | Steven Barnhart <> | Date | 29 Dec 2002 17:59:12 -0500 |
| |
The following patch #undef's the variable ALIGN in include/linux/cache.h so that drivers/net/defxx.c can use the same variable. Patch has been tested and defxx.c compiles. Please apply.
Steven
--------
# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.974 -> 1.975 # include/linux/cache.h 1.5 -> 1.6 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/12/29 steven@sbarn.net 1.975 # [PATCH] This patch allows drivers/net/defxx.c to compile and use the variable ALIGN which was left defined by include/linux/cache.h. # -------------------------------------------- # diff -Nru a/include/linux/cache.h b/include/linux/cache.h --- a/include/linux/cache.h Sun Dec 29 17:39:44 2002 +++ b/include/linux/cache.h Sun Dec 29 17:39:44 2002 @@ -52,5 +52,5 @@ #define ____cacheline_maxaligned_in_smp #endif #endif - +#undef ALIGN #endif /* __LINUX_CACHE_H */ # This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.974 -> 1.975 # include/linux/cache.h 1.5 -> 1.6 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/12/29 steven@sbarn.net 1.975 # [PATCH] This patch allows drivers/net/defxx.c to compile and use the variable ALIGN which was left defined by include/linux/cache.h. # -------------------------------------------- # diff -Nru a/include/linux/cache.h b/include/linux/cache.h --- a/include/linux/cache.h Sun Dec 29 17:39:44 2002 +++ b/include/linux/cache.h Sun Dec 29 17:39:44 2002 @@ -52,5 +52,5 @@ #define ____cacheline_maxaligned_in_smp #endif #endif - +#undef ALIGN #endif /* __LINUX_CACHE_H */ | |