From 946199928be31734e3143010177659277ca3544f Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 23 Mar 2012 16:22:50 -0700 Subject: [PATCH] --- yaml --- r: 297403 b: refs/heads/master c: f5243d6de7ae232e1d81e44ae9756bbd8c988fcd h: refs/heads/master i: 297401: afa3113760a82298108f6b8e57a1e8771245159b 297399: 5aba0deebf8d8715858d8a8f1112b9ac7451b062 v: v3 --- [refs] | 2 +- trunk/arch/x86/configs/i386_defconfig | 1 - trunk/arch/x86/configs/x86_64_defconfig | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 71e33c881ed4..200e5289e243 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65c0ff4079c011232e795e62c74a0a95512b7ac3 +refs/heads/master: f5243d6de7ae232e1d81e44ae9756bbd8c988fcd diff --git a/trunk/arch/x86/configs/i386_defconfig b/trunk/arch/x86/configs/i386_defconfig index 2d562821a88f..119db67dcb03 100644 --- a/trunk/arch/x86/configs/i386_defconfig +++ b/trunk/arch/x86/configs/i386_defconfig @@ -183,7 +183,6 @@ CONFIG_8139TOO=y # CONFIG_8139TOO_PIO is not set CONFIG_R8169=y CONFIG_FDDI=y -CONFIG_TR=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y diff --git a/trunk/arch/x86/configs/x86_64_defconfig b/trunk/arch/x86/configs/x86_64_defconfig index 3cf137ad2789..76eb2903809f 100644 --- a/trunk/arch/x86/configs/x86_64_defconfig +++ b/trunk/arch/x86/configs/x86_64_defconfig @@ -176,7 +176,6 @@ CONFIG_SKY2=y CONFIG_FORCEDETH=y CONFIG_8139TOO=y CONFIG_FDDI=y -CONFIG_TR=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y