diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-07-26 10:53:23 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-07-26 10:53:23 +0000 |
| commit | 115a129a30ab1a50d62f8efac868db2380909624 (patch) | |
| tree | 4a23a5ed448fd40c6f12dbf60c409f6cf6d860ba /target/linux/avr32 | |
| parent | bf6c297d604df4139882975b986685cda0c1ca84 (diff) | |
[kernel] update to 2.6.25.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11933 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/avr32')
| -rw-r--r-- | target/linux/avr32/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/avr32/patches/100-git_sync.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 650d4936b..a9af238f7 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -10,7 +10,7 @@ ARCH:=avr32 BOARD:=avr32 BOARDNAME:=Atmel AVR32 FEATURES:=squashfs -LINUX_VERSION:=2.6.25.10 +LINUX_VERSION:=2.6.25.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/patches/100-git_sync.patch b/target/linux/avr32/patches/100-git_sync.patch index f1e1cf733..2f6291a7d 100644 --- a/target/linux/avr32/patches/100-git_sync.patch +++ b/target/linux/avr32/patches/100-git_sync.patch @@ -9659,7 +9659,7 @@ +obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o obj-$(CONFIG_MMC_SPI) += mmc_spi.o - + obj-$(CONFIG_GPIOMMC) += gpiommc.o --- /dev/null +++ b/drivers/mmc/host/atmel-mci.c @@ -0,0 +1,1234 @@ @@ -14714,7 +14714,7 @@ +#endif --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1691,6 +1691,8 @@ +@@ -1692,6 +1692,8 @@ extern int invalidate_inode_pages2(struct address_space *mapping); extern int invalidate_inode_pages2_range(struct address_space *mapping, pgoff_t start, pgoff_t end); |