diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 23:06:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 23:06:24 +0000 |
| commit | 4512542b1843804bb19fd108a613f903c1d885a0 (patch) | |
| tree | e8d798695143603f4f392cd2485dff6eed23fa90 /packages/ixp4xx/ixp-osal-2.1/le.patch | |
| parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
ixp-osal: merge with latest nslu2 CVS patch set in 2.1
- there is no significant change in this merge, just whitespace
- at the end of a couple of source file lines. All patches are
- now 'sanitised' to remove the date stamps (which otherwise
- make comparisons difficult).
Diffstat (limited to 'packages/ixp4xx/ixp-osal-2.1/le.patch')
| -rw-r--r-- | packages/ixp4xx/ixp-osal-2.1/le.patch | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/packages/ixp4xx/ixp-osal-2.1/le.patch b/packages/ixp4xx/ixp-osal-2.1/le.patch index 3fc5ddf624..a6936ea33b 100644 --- a/packages/ixp4xx/ixp-osal-2.1/le.patch +++ b/packages/ixp4xx/ixp-osal-2.1/le.patch @@ -1,6 +1,13 @@ ---- ixp_osal/include/modules/ioMem/IxOsalIoMem.h 2005-04-17 20:56:25.000000000 -0700 -+++ ixp_osal/include/modules/ioMem/IxOsalIoMem.h 2005-10-07 16:20:27.786083595 -0700 -@@ -105,8 +105,8 @@ + include/modules/ioMem/IxOsalIoMem.h | 4 ++-- + include/modules/ioMem/IxOsalMemAccess.h | 2 +- + os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h | 2 +- + os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h | 2 +- + os/linux/src/modules/ioMem/IxOsalOsIoMem.c | 3 +++ + 5 files changed, 8 insertions(+), 5 deletions(-) + +--- ixp_osal/include/modules/ioMem/IxOsalIoMem.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/include/modules/ioMem/IxOsalIoMem.h 1970-01-01 00:00:00.000000000 +0000 +@@ -117,8 +117,8 @@ ixOsalCoreWordSwap (UINT32 wordIn) #endif /* ndef __wince */ #define IX_OSAL_SWAP_SHORT(sData) ((sData >> 8) | ((sData & 0xFF) << 8)) @@ -11,8 +18,8 @@ #define IX_OSAL_BE_XSTOBUSL(wData) (wData) #define IX_OSAL_BE_XSTOBUSS(sData) (sData) ---- ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 2005-04-17 20:56:25.000000000 -0700 -+++ ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 2005-11-19 16:44:33.414684841 -0800 +--- ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 1970-01-01 00:00:00.000000000 +0000 @@ -84,7 +84,7 @@ #elif defined (IX_OSAL_LINUX_LE) @@ -22,8 +29,8 @@ #elif defined (IX_OSAL_WINCE_LE) ---- ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 2005-04-17 20:56:27.000000000 -0700 -+++ ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 2005-11-19 16:45:35.298578949 -0800 +--- ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 1970-01-01 00:00:00.000000000 +0000 @@ -171,7 +171,7 @@ ***************************/ #if (IX_COMPONENT_NAME == ix_qmgr) @@ -33,18 +40,19 @@ #endif /* qmgr */ ---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-11-19 15:53:11.808771607 -0800 -+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-11-19 16:51:40.729574072 -0800 -@@ -101,6 +101,6 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[] +--- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 1970-01-01 00:00:00.000000000 +0000 +@@ -107,7 +107,7 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[] + ixOsalLinuxMemMap, /* mapFunction */ ixOsalLinuxMemUnmap, /* unmapFunction */ 0, /* refCount */ - IX_OSAL_BE | IX_OSAL_LE_DC, /* endianType */ -+ IX_OSAL_BE | IX_OSAL_LE_AC, /* endianType */ ++ IX_OSAL_BE | IX_OSAL_LE_AC, /* endianType */ "qMgr" /* name */ }, ---- ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c 2005-09-24 20:57:03.000000000 -0700 -+++ ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c 2005-11-20 15:21:33.670138502 -0800 +--- ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c 1970-01-01 00:00:00.000000000 +0000 @@ -45,6 +45,7 @@ * -- End Intel Copyright Notice -- */ @@ -53,7 +61,7 @@ #include <asm/io.h> #include <linux/ioport.h> -@@ -54,6 +54,8 @@ +@@ -54,6 +55,8 @@ PUBLIC void ixOsalLinuxMemMap (IxOsalMemoryMap * map) { |