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/ixp4xx-header.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/ixp4xx-header.patch')
| -rw-r--r-- | packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch index 28bd3d362b..70eec5e728 100644 --- a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch +++ b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch @@ -1,5 +1,9 @@ ---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-11-20 00:51:37.637649252 -0800 -+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-11-20 00:51:45.890168551 -0800 + os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h | 72 ++++++++++ + os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h | 10 - + 2 files changed, 78 insertions(+), 4 deletions(-) + +--- 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 @@ -53,6 +53,8 @@ #error "Error: IxOsalOsIxp425Sys.h cannot be included directly before IxOsalOsIxp400.h" #endif @@ -9,7 +13,7 @@ /* Memory Base Address */ #define IX_OSAL_IXP400_EXP_BUS_PHYS_BASE IXP425_EXP_BUS_BASE2_PHYS #define IX_OSAL_IXP400_EXP_BUS_BOOT_PHYS_BASE IXP425_EXP_BUS_BASE1_PHYS -@@ -98,14 +98,14 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[] +@@ -98,12 +100,12 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[] * Queue Manager */ { @@ -26,10 +30,8 @@ 0, /* refCount */ IX_OSAL_BE | IX_OSAL_LE_DC, /* endianType */ "qMgr" /* name */ - }, - ---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 2005-09-06 00:17:15.000000000 -0700 -+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 2005-11-20 08:25:18.402543995 -0800 +--- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000 @@ -0,0 +1,72 @@ +/* + * Glue for the current linux definitons of this stuff. |