diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-02 10:05:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 10:05:24 +1000 |
| commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
| tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /arch/arm/configs/ns9xxx_defconfig | |
| parent | 167ffc44caaee68ea60dadf6931a4d195a4ed1f0 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'arch/arm/configs/ns9xxx_defconfig')
| -rw-r--r-- | arch/arm/configs/ns9xxx_defconfig | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/configs/ns9xxx_defconfig b/arch/arm/configs/ns9xxx_defconfig index 7dc1580e4d99..1f528a002983 100644 --- a/arch/arm/configs/ns9xxx_defconfig +++ b/arch/arm/configs/ns9xxx_defconfig @@ -3,26 +3,11 @@ CONFIG_IKCONFIG_PROC=y CONFIG_BLK_DEV_INITRD=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_IOSCHED_AS is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_NS9XXX=y -CONFIG_MACH_A9M9360=y -CONFIG_MACH_A9M9750=y -CONFIG_MACH_CC7UCAMRY=y -CONFIG_MACH_CC9C=y -CONFIG_MACH_CC9P9210=y -CONFIG_MACH_CC9P9210JS=y -CONFIG_MACH_CC9P9215=y -CONFIG_MACH_CC9P9215JS=y CONFIG_MACH_CC9P9360DEV=y CONFIG_MACH_CC9P9360JS=y -CONFIG_MACH_CC9P9360VAL=y -CONFIG_MACH_CC9P9750DEV=y -CONFIG_MACH_CC9P9750VAL=y -CONFIG_MACH_CCW9C=y -CONFIG_MACH_INC20OTTER=y -CONFIG_MACH_OTTER=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_FPE_NWFPE=y @@ -39,24 +24,18 @@ CONFIG_MTD_CFI=m CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_CFI_AMDSTD=m CONFIG_MTD_PHYSMAP=m -CONFIG_MTD_PHYSMAP_START=0x0 CONFIG_BLK_DEV_LOOP=m CONFIG_NETDEVICES=y CONFIG_NET_ETHERNET=y -CONFIG_NS9XXX_ETH=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_NS921X=y -CONFIG_SERIAL_NS921X_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set -CONFIG_ADC_NS9215=m CONFIG_I2C=m CONFIG_I2C_GPIO=m # CONFIG_HWMON is not set # CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_DEBUG is not set # CONFIG_USB_SUPPORT is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m @@ -65,7 +44,6 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_RTC_CLASS=m -CONFIG_RTC_DRV_NS9215=m CONFIG_EXT2_FS=m CONFIG_TMPFS=y CONFIG_JFFS2_FS=m @@ -73,7 +51,6 @@ CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_USER=y CONFIG_DEBUG_ERRORS=y |