diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2009-05-25 12:27:13 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2009-05-25 12:27:13 +0000 |
commit | 04bca7b528c9697d604c4ab88464b9604fe84be3 (patch) | |
tree | e33328c39e19ce04867c4a6815b42e41fde9b382 /target/linux/gemini | |
parent | cd649df858be5066ae06a73647f6578421e541f7 (diff) | |
download | upstream-04bca7b528c9697d604c4ab88464b9604fe84be3.tar.gz upstream-04bca7b528c9697d604c4ab88464b9604fe84be3.tar.bz2 upstream-04bca7b528c9697d604c4ab88464b9604fe84be3.zip |
update to 2.6.30-rc7
SVN-Revision: 16048
Diffstat (limited to 'target/linux/gemini')
-rw-r--r-- | target/linux/gemini/Makefile | 2 | ||||
-rw-r--r-- | target/linux/gemini/patches/001-git_sync.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index b83bc4d5d2..31e6dbc096 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cortina Systems CS351x FEATURES:=jffs2 broken CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time -LINUX_VERSION:=2.6.30-rc6 +LINUX_VERSION:=2.6.30-rc7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/patches/001-git_sync.patch b/target/linux/gemini/patches/001-git_sync.patch index e0306e8569..d36c5a277e 100644 --- a/target/linux/gemini/patches/001-git_sync.patch +++ b/target/linux/gemini/patches/001-git_sync.patch @@ -80,7 +80,7 @@ static inline int dma_is_consistent(struct device *dev, dma_addr_t handle) --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -824,7 +824,7 @@ config ISA_DMA_API +@@ -825,7 +825,7 @@ config ISA_DMA_API bool config PCI |