diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 18:40:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 18:40:39 -0500 |
commit | ea14fad0d416354a4e9bb1a04f32acba706f9548 (patch) | |
tree | 2c8acc5331f189aef1d40ddce3f40d6be9314e77 /arch/arm/configs/at91rm9200dk_defconfig | |
parent | 6ee7e78e7c78d871409ad4df30551c9355be7d0e (diff) | |
parent | 6705cda24fad1cb0ac82ac4f312df8ec735b39b0 (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
[ARM] 4001/1: S3C24XX: shorten reboot time
[ARM] 3983/2: remove unused argument to __bug()
[ARM] 4000/1: Osiris: add third serial port in
[ARM] 3999/1: RX3715: suspend to RAM support
[ARM] 3998/1: VR1000: LED platform devices
[ARM] 3995/1: iop13xx: add iop13xx support
[ARM] 3968/1: iop13xx: add iop13xx_defconfig
[ARM] Update mach-types
[ARM] Allow gcc to optimise arm_add_memory a little more
[ARM] 3991/1: i.MX/MX1 high resolution time source
[ARM] 3990/1: i.MX/MX1 more precise PLL decode
[ARM] 3986/1: H1940: suspend to RAM support
[ARM] 3985/1: ixp4xx clocksource cleanup
[ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
[ARM] 3994/1: ixp23xx: fix handling of pci master aborts
[ARM] 3981/1: sched_clock for PXA2xx
[ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
[ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
[ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
...
Diffstat (limited to 'arch/arm/configs/at91rm9200dk_defconfig')
-rw-r--r-- | arch/arm/configs/at91rm9200dk_defconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig index b43041476e02..e10d003566d6 100644 --- a/arch/arm/configs/at91rm9200dk_defconfig +++ b/arch/arm/configs/at91rm9200dk_defconfig | |||
@@ -357,9 +357,9 @@ CONFIG_MTD_CFI_UTIL=y | |||
357 | # | 357 | # |
358 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 358 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
359 | CONFIG_MTD_PHYSMAP=y | 359 | CONFIG_MTD_PHYSMAP=y |
360 | CONFIG_MTD_PHYSMAP_START=0x10000000 | 360 | CONFIG_MTD_PHYSMAP_START=0 |
361 | CONFIG_MTD_PHYSMAP_LEN=0x200000 | 361 | CONFIG_MTD_PHYSMAP_LEN=0 |
362 | CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | 362 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 |
363 | # CONFIG_MTD_ARM_INTEGRATOR is not set | 363 | # CONFIG_MTD_ARM_INTEGRATOR is not set |
364 | # CONFIG_MTD_IMPA7 is not set | 364 | # CONFIG_MTD_IMPA7 is not set |
365 | # CONFIG_MTD_PLATRAM is not set | 365 | # CONFIG_MTD_PLATRAM is not set |
@@ -585,7 +585,9 @@ CONFIG_AT91RM9200_WATCHDOG=y | |||
585 | # CONFIG_USBPCWATCHDOG is not set | 585 | # CONFIG_USBPCWATCHDOG is not set |
586 | # CONFIG_NVRAM is not set | 586 | # CONFIG_NVRAM is not set |
587 | # CONFIG_RTC is not set | 587 | # CONFIG_RTC is not set |
588 | CONFIG_AT91_RTC=y | 588 | CONFIG_RTC_LIB=y |
589 | CONFIG_RTC_CLASS=y | ||
590 | CONFIG_RTC_DRV_AT91RM9200=y | ||
589 | # CONFIG_DTLK is not set | 591 | # CONFIG_DTLK is not set |
590 | # CONFIG_R3964 is not set | 592 | # CONFIG_R3964 is not set |
591 | 593 | ||
@@ -979,7 +981,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
979 | CONFIG_FRAME_POINTER=y | 981 | CONFIG_FRAME_POINTER=y |
980 | # CONFIG_RCU_TORTURE_TEST is not set | 982 | # CONFIG_RCU_TORTURE_TEST is not set |
981 | CONFIG_DEBUG_USER=y | 983 | CONFIG_DEBUG_USER=y |
982 | # CONFIG_DEBUG_WAITQ is not set | ||
983 | # CONFIG_DEBUG_ERRORS is not set | 984 | # CONFIG_DEBUG_ERRORS is not set |
984 | CONFIG_DEBUG_LL=y | 985 | CONFIG_DEBUG_LL=y |
985 | # CONFIG_DEBUG_ICEDCC is not set | 986 | # CONFIG_DEBUG_ICEDCC is not set |