diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-07 13:47:56 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-07 13:47:56 -0500 |
| commit | ea3398a1ae54cd3403f3cc0f6aa498c7452c681a (patch) | |
| tree | 19903cfd3eb11f6cdd84f3b6923e604028178150 /arch/arm/configs/kafa_defconfig | |
| parent | 03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41 (diff) | |
| parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff) | |
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/configs/kafa_defconfig')
| -rw-r--r-- | arch/arm/configs/kafa_defconfig | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/arch/arm/configs/kafa_defconfig b/arch/arm/configs/kafa_defconfig deleted file mode 100644 index 896dbe00dc6..00000000000 --- a/arch/arm/configs/kafa_defconfig +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | # CONFIG_LOCALVERSION_AUTO is not set | ||
| 3 | # CONFIG_SWAP is not set | ||
| 4 | CONFIG_SYSVIPC=y | ||
| 5 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 6 | CONFIG_SLAB=y | ||
| 7 | CONFIG_MODULES=y | ||
| 8 | CONFIG_MODULE_UNLOAD=y | ||
| 9 | # CONFIG_IOSCHED_CFQ is not set | ||
| 10 | CONFIG_ARCH_AT91=y | ||
| 11 | CONFIG_MACH_KAFA=y | ||
| 12 | # CONFIG_ARM_THUMB is not set | ||
| 13 | CONFIG_PREEMPT=y | ||
| 14 | CONFIG_LEDS=y | ||
| 15 | CONFIG_LEDS_CPU=y | ||
| 16 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 17 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 18 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20800000,10M root=/dev/ram0 rw" | ||
| 19 | CONFIG_FPE_NWFPE=y | ||
| 20 | CONFIG_BINFMT_MISC=y | ||
| 21 | CONFIG_NET=y | ||
| 22 | CONFIG_PACKET=y | ||
| 23 | CONFIG_UNIX=y | ||
| 24 | CONFIG_INET=y | ||
| 25 | # CONFIG_INET_DIAG is not set | ||
| 26 | # CONFIG_IPV6 is not set | ||
| 27 | CONFIG_MTD=y | ||
| 28 | CONFIG_MTD_PARTITIONS=y | ||
| 29 | CONFIG_MTD_CHAR=y | ||
| 30 | CONFIG_MTD_BLOCK_RO=y | ||
| 31 | CONFIG_NETDEVICES=y | ||
| 32 | CONFIG_PHYLIB=y | ||
| 33 | CONFIG_DAVICOM_PHY=y | ||
| 34 | CONFIG_NET_ETHERNET=y | ||
| 35 | CONFIG_ARM_AT91_ETHER=y | ||
| 36 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
| 37 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 38 | # CONFIG_INPUT_MOUSE is not set | ||
| 39 | # CONFIG_SERIO is not set | ||
| 40 | CONFIG_SERIAL_ATMEL=y | ||
| 41 | CONFIG_SERIAL_ATMEL_CONSOLE=y | ||
| 42 | CONFIG_LEGACY_PTY_COUNT=32 | ||
| 43 | CONFIG_I2C=y | ||
| 44 | CONFIG_I2C_CHARDEV=y | ||
| 45 | CONFIG_I2C_GPIO=y | ||
| 46 | # CONFIG_HWMON is not set | ||
| 47 | CONFIG_WATCHDOG=y | ||
| 48 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
| 49 | CONFIG_AT91RM9200_WATCHDOG=y | ||
| 50 | # CONFIG_VGA_CONSOLE is not set | ||
| 51 | CONFIG_RTC_CLASS=y | ||
| 52 | # CONFIG_RTC_HCTOSYS is not set | ||
| 53 | CONFIG_RTC_DRV_AT91RM9200=y | ||
| 54 | CONFIG_EXT3_FS=y | ||
| 55 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 56 | CONFIG_TMPFS=y | ||
| 57 | CONFIG_CRAMFS=y | ||
| 58 | CONFIG_NFS_FS=m | ||
| 59 | CONFIG_NFS_V3=y | ||
| 60 | CONFIG_CRYPTO_MD5=y | ||
| 61 | CONFIG_CRYPTO_DES=y | ||