Author: adamg Date: Mon Jun 2 17:06:23 2008 GMT Module: SOURCES Tag: HEAD ---- Log message: - new
---- Files affected: SOURCES: ipw3945-build.patch (NONE -> 1.1) (NEW), ipw3945-kernel-2.6.24.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/ipw3945-build.patch diff -u /dev/null SOURCES/ipw3945-build.patch:1.1 --- /dev/null Mon Jun 2 19:06:23 2008 +++ SOURCES/ipw3945-build.patch Mon Jun 2 19:06:18 2008 @@ -0,0 +1,38 @@ +diff -urNp ipw3945-1.2.2.org/Makefile ipw3945-1.2.2/Makefile +--- ipw3945-1.2.2.org/Makefile 2007-04-30 06:44:56.000000000 +0300 ++++ ipw3945-1.2.2/Makefile 2007-11-14 19:23:07.000000000 +0200 +@@ -193,34 +193,6 @@ utils: + @[ ! -d util ] || make -C util IEEE80211_PATH=$(IEEE80211_PATH) + + check_inc: +- @( [ "$(IEEE80211_DUPLICATE)" ] && echo -e \ +-"\n WARNING: Your kernel contains ieee80211 symbol definitions and you\n"\ +-"are not using the kernel's default ieee80211 subsystem. (Perhaps you\n"\ +-"used the out-of-tree ieee80211 subsystem's 'make install' or have\n"\ +-"provided a path to the ieee80211 subsystem via IEEE80211_INC.)\n\n"\ +-"If you wish to use the out-of-tree ieee80211 subsystem then it is\n"\ +-"recommended to use that projects' \"make patch_kernel\" facility\n"\ +-"and rebuild your kernel to update the Module symbol version information.\n"\ +-"\n"\ +-"Failure to do this may result in build warnings and unexpected\n"\ +-"behavior when running modules which rely on the ieee80211 subsystem.\n\n"\ || \ +- exit 0) +- +- @( [ "$(IEEE80211_DUPLICATE)" ] && \ +- [ ! "$(IEEE80211_IGNORE_DUPLICATE)" ] && echo -e \ +-" Aborting the build. You can force the build to continue by adding:\n\n"\ +-"\tIEEE80211_IGNORE_DUPLICATE=y\n\n"\ +-"to your make command line.\n\n" && exit 1 || exit 0) +- +- @( [ ! "$(IEEE80211_API)" ] && echo -e \ +-"\n ERROR: A compatible subsystem was not found in the following path[s]:\n\n"\ +-"\t$(IEEE80211_RES)\n\n"\ +-"You need to install the ieee80211 subsystem from http://ieee80211.sf.net\n"\ +-"and point this build to the location where you installed those sources, eg.:\n\n"\ +-"\t% make IEEE80211_INC=/usr/src/ieee80211/\n\n"\ +-"or use the 'make patch_kernel' within the ieee80211 subsystem to patch your\n"\ +-"kernel sources.\n" && exit 1 || exit 0) +- + @echo -e \ + " Using ieee80211 subsystem version API v$(IEEE80211_API) from:\n\n" \ + "\tBase: $(IEEE80211_BASE)\n" \ ================================================================ Index: SOURCES/ipw3945-kernel-2.6.24.patch diff -u /dev/null SOURCES/ipw3945-kernel-2.6.24.patch:1.1 --- /dev/null Mon Jun 2 19:06:23 2008 +++ SOURCES/ipw3945-kernel-2.6.24.patch Mon Jun 2 19:06:18 2008 @@ -0,0 +1,21 @@ +--- ipw3945-1.2.2/ipw3945.h.orig 2007-07-31 09:53:39.000000000 +0300 ++++ ipw3945-1.2.2/ipw3945.h 2007-12-23 04:09:59.000000000 +0200 +@@ -2414,6 +2414,18 @@ enum { + #define IPW_ORD_TABLE_7_MASK 0x0000F700 + + /* ++ * For backword Kernel compatibility (after 2.6.24) ++ */ ++#if !defined(MAC_ARG) ++#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] ++#endif ++ ++#if !defined(SET_MODULE_OWNER) ++#define SET_MODULE_OWNER(dev) do { } while (0) ++#endif ++ ++ ++/* + * Table 0 Entries (all entries are 32 bits) + */ + enum { ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
