diff options
| author | Philip Balister <philip@balister.org> | 2007-10-03 23:37:55 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-10-03 23:37:55 +0000 |
| commit | 080e5e03b1d20427e0d441f47f4e231ba27747b2 (patch) | |
| tree | 3554da21996adafaea447bef7595fed142d4241a | |
| parent | 28bbfa1c1ce42dfd54653330f59e1a11b6456371 (diff) | |
| parent | 83ed84ce4985db7354cdf8cef5389af4144eadd0 (diff) | |
merge of '841a5712bf3e160a32fddc18de65062237b46ed6'
and 'f73119cc933563eddde899dd80930c0dfb4625e3'
| -rw-r--r-- | conf/machine/include/gumstix.inc | 6 | ||||
| -rw-r--r-- | packages/linux/linux-2.6.21/gumstix-verdex/defconfig | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc index 4f66f92cf0..fc5fd4e136 100644 --- a/conf/machine/include/gumstix.inc +++ b/conf/machine/include/gumstix.inc @@ -13,6 +13,7 @@ module_autoload_mmc_block = "mmc_block" module_autoload_gumstix_gadget = "gumstix_gadget" module_autoload_g_ether = "g_ether" module_autoload_smc91x = "smc91x" +module_autoload_smc911x = "smc911x" UBOOT_ENTRYPOINT = "a0008000" @@ -33,8 +34,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \ kernel-module-rtc-sysfs \ kernel-module-smc91x \ kernel-module-gumstix-smc91x \ - " - + kernel-module-smc911x \ + kernel-module-gumstix-smc911x \ + " # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig index 9107cd0d7c..c6d5480089 100644 --- a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig +++ b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21 -# Thu Sep 13 14:49:02 2007 +# Wed Oct 3 16:35:16 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -828,7 +828,8 @@ CONFIG_MII=m CONFIG_SMC91X=m CONFIG_SMC91X_GUMSTIX=m # CONFIG_DM9000 is not set -# CONFIG_SMC911X is not set +CONFIG_SMC911X=m +CONFIG_SMC911X_GUMSTIX=m # # Ethernet (1000 Mbit) |