diff --git a/arch/arm/mach-exynos/mach-hkdk4412.c b/arch/arm/mach-exynos/mach-hkdk4412.c
index 6cd140bf67b2..41b3e09628db 100644
--- a/arch/arm/mach-exynos/mach-hkdk4412.c
+++ b/arch/arm/mach-exynos/mach-hkdk4412.c
@@ -424,7 +424,7 @@ static void __init hkdk4412_usbswitch_init(void)
 	}
 
 	s3c_gpio_cfgpin(pdata->gpio_host_detect, S3C_GPIO_SFN(0xF));
-	s3c_gpio_setpull(pdata->gpio_host_detect, S3C_GPIO_PULL_NONE);
+	s3c_gpio_setpull(pdata->gpio_host_detect, S3C_GPIO_PULL_UP);
 	gpio_free(pdata->gpio_host_detect);
 
 	pdata->gpio_device_detect = EXYNOS4_GPX1(6); /* high active */
@@ -435,7 +435,7 @@ static void __init hkdk4412_usbswitch_init(void)
 	}
 
 	s3c_gpio_cfgpin(pdata->gpio_device_detect, S3C_GPIO_SFN(0xF));
-	s3c_gpio_setpull(pdata->gpio_device_detect, S3C_GPIO_PULL_NONE);
+	s3c_gpio_setpull(pdata->gpio_device_detect, S3C_GPIO_PULL_DOWN);
 	gpio_free(pdata->gpio_device_detect);
 
 	pdata->gpio_host_vbus = EXYNOS4_GPL2(0);
diff --git a/ubuntu/aufs/conf.str b/ubuntu/aufs/conf.str
index d44fb00fa388..3f5c988e6c10 100644
--- a/ubuntu/aufs/conf.str
+++ b/ubuntu/aufs/conf.str
@@ -1,14 +1,6 @@
 "CONFIG_AUFS_FS=m\n"
 "CONFIG_AUFS_BRANCH_MAX_127=y\n"
 "CONFIG_AUFS_SBILIST=y\n"
-"CONFIG_AUFS_HNOTIFY=y\n"
-"CONFIG_AUFS_HFSNOTIFY=y\n"
-"CONFIG_AUFS_EXPORT=y\n"
-"CONFIG_AUFS_RDU=y\n"
-"CONFIG_AUFS_SP_IATTR=y\n"
-"CONFIG_AUFS_SHWH=y\n"
 "CONFIG_AUFS_BR_RAMFS=y\n"
-"CONFIG_AUFS_BR_FUSE=y\n"
-"CONFIG_AUFS_POLL=y\n"
 "CONFIG_AUFS_BR_HFSPLUS=y\n"
 "CONFIG_AUFS_BDEV_LOOP=y\n"
diff --git a/ubuntu/aufs/conf.str.tmp b/ubuntu/aufs/conf.str.tmp
index d44fb00fa388..3f5c988e6c10 100644
--- a/ubuntu/aufs/conf.str.tmp
+++ b/ubuntu/aufs/conf.str.tmp
@@ -1,14 +1,6 @@
 "CONFIG_AUFS_FS=m\n"
 "CONFIG_AUFS_BRANCH_MAX_127=y\n"
 "CONFIG_AUFS_SBILIST=y\n"
-"CONFIG_AUFS_HNOTIFY=y\n"
-"CONFIG_AUFS_HFSNOTIFY=y\n"
-"CONFIG_AUFS_EXPORT=y\n"
-"CONFIG_AUFS_RDU=y\n"
-"CONFIG_AUFS_SP_IATTR=y\n"
-"CONFIG_AUFS_SHWH=y\n"
 "CONFIG_AUFS_BR_RAMFS=y\n"
-"CONFIG_AUFS_BR_FUSE=y\n"
-"CONFIG_AUFS_POLL=y\n"
 "CONFIG_AUFS_BR_HFSPLUS=y\n"
 "CONFIG_AUFS_BDEV_LOOP=y\n"