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/Makefile.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/Makefile.patch')
| -rw-r--r-- | packages/ixp4xx/ixp-osal-2.1/Makefile.patch | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/packages/ixp4xx/ixp-osal-2.1/Makefile.patch b/packages/ixp4xx/ixp-osal-2.1/Makefile.patch index f852ea2b26..d687ebc070 100644 --- a/packages/ixp4xx/ixp-osal-2.1/Makefile.patch +++ b/packages/ixp4xx/ixp-osal-2.1/Makefile.patch @@ -1,18 +1,21 @@ -diff -Naur ixp_osal.orig/Makefile ixp_osal/Makefile ---- ixp_osal.orig/Makefile 2005-08-24 00:16:37.000000000 +0200 -+++ ixp_osal/Makefile 2005-08-24 00:18:02.000000000 +0200 -@@ -172,7 +172,7 @@ + Makefile | 2 +- + os/linux/make/macros.mk | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- ixp_osal/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/Makefile 1970-01-01 00:00:00.000000000 +0000 +@@ -185,7 +185,7 @@ endif + INCLUDE_DIRS = include $(OSAL_DIRS:%=$(MAIN_INC_PREFIX)/%) $(OSAL_DIRS:%=$(OS_INC_PREFIX)/%) - # TODO push this to linux make ifeq ($(IX_OSAL_MK_HOST_OS), linux) -INCLUDE_DIRS += $(LINUX_SRC)/include/asm-arm/arch-ixp425/ +INCLUDE_DIRS += $(LINUX_SRC)/include/asm-arm/arch-ixp4xx/ endif - CFLAGS += $(INCLUDE_DIRS:%=-I%) ---- ixp_osal/os/linux/make/macros.mk.orig 2005-10-01 15:50:19.544167880 -0700 -+++ ixp_osal/os/linux/make/macros.mk 2005-10-01 15:50:43.053647239 -0700 -@@ -88,10 +88,10 @@ + CFLAGS += $(INCLUDE_DIRS:%=-I%) +--- ixp_osal/os/linux/make/macros.mk 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/make/macros.mk 1970-01-01 00:00:00.000000000 +0000 +@@ -88,10 +88,10 @@ AR := $(LINUX_CROSS_COMPILE)ar # Compiler & linker options # Compiler flags |