[tools] mkimage/getline.h - Mac OS X 10.7 (Lion) fix

[openwrt.git] / target / linux / generic / config-2.6.39

diff --git a/target/linux/generic/config-2.6.39 b/target/linux/generic/config-2.6.39
index 0dceb01..2016618 100644 (file)
--- a/target/linux/generic/config-2.6.39
+++ b/target/linux/generic/config-2.6.39
@@ -928,14 +928,6 @@ CONFIG_HZ_100=y
 CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IDEAPAD_LAPTOP is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
 # CONFIG_IEEE802154 is not set
 # CONFIG_IFB is not set
 # CONFIG_IGB is not set
@@ -1000,7 +992,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_INOTIFY_USER is not set
+CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT is not set
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
@@ -1461,6 +1453,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
 # CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_IDS=y
@@ -1784,6 +1777,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCF_SAFE is not set
 # CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_UBSEC_SSB is not set
 # CONFIG_OC_ETM is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_ORION_WATCHDOG is not set
@@ -2411,6 +2405,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_ES18XX is not set
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FIREWIRE is not set
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_GINA24 is not set
@@ -2630,6 +2625,7 @@ CONFIG_TINY_RCU=y
 # CONFIG_TLAN is not set
 # CONFIG_TMD_HERMES is not set
 CONFIG_TMPFS=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set