diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2006-01-14 08:45:40 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-14 08:45:40 +0000 |
| commit | 0f93bc82fd506c282aa963e0b4ed5de8412b9695 (patch) | |
| tree | 211c0cce46e7e2f05e97c6a27e7c7c6045b7ea62 | |
| parent | cda660808fbc381cc11fb9ceb3cd0cde13c239d7 (diff) | |
| parent | 834e0aaa9e5048ca1872a7022ddb639fa15a2f18 (diff) | |
merge of d3538e5f45f69d0b65a1d425359ba88009d3ef91
and e7693771f829a9afffa119fcdc723d562cbb94fa
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.15/defconfig | 9 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.15.bb | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig index c05034de19..1643ab8b43 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 -# Thu Jan 12 17:44:50 2006 +# Fri Jan 13 23:40:57 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -112,12 +112,13 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y # IXP4xx Platforms # CONFIG_MACH_NSLU2=y -# CONFIG_ARCH_AVILA is not set +CONFIG_ARCH_AVILA=y CONFIG_MACH_LOFT=y # CONFIG_ARCH_ADI_COYOTE is not set -# CONFIG_ARCH_IXDP425 is not set +CONFIG_ARCH_IXDP425=y # CONFIG_MACH_IXDPG425 is not set # CONFIG_MACH_IXDP465 is not set +CONFIG_ARCH_IXCDP1100=y # CONFIG_ARCH_PRPMC1100 is not set CONFIG_MACH_NAS100D=y CONFIG_ARCH_IXDP4XX=y @@ -1362,7 +1363,7 @@ CONFIG_RTC_INTF_DEV=y # RTC drivers # CONFIG_RTC_DRV_X1205=y -# CONFIG_RTC_DRV_DS1672 is not set +CONFIG_RTC_DRV_DS1672=y # CONFIG_RTC_DRV_TEST is not set # diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index 8af2fde408..6da130772c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -3,7 +3,7 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "0" +PR_CONFIG = "1" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches |