diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-12 12:43:02 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-12 12:43:02 +0000 |
commit | 41a9fdc088f60373864a5128e5b69d467412a34c (patch) | |
tree | f21e362bb285d4da20ac54c951864a6f5fa146bf /conf | |
parent | 2123a2aba7385cb19a25f0cf61be70bea52f5929 (diff) | |
parent | 60e2d42b95077363829155bbb094f882ab2afcd4 (diff) |
merge of '6fac15e307a3e92d647e9f142ee8341eec839a79'
and 'c1286096ff5c06af943961004df6e2d4107937ea'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/fic-gta01.conf | 5 | ||||
-rw-r--r-- | conf/machine/fic-gta02.conf | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index bdfc3a6f47..4e07379582 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -11,8 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gta01" MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone" -MACHINE_EXTRA_RDEPENDS = "alsa-state" - # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-bt \ @@ -26,9 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-soc-smdk2440 \ kernel-module-nls-iso8859-1 \ kernel-module-nls-cp437 \ - \ - alsa-state \ - alsa-states \ " # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index de6de24ec1..45483fd21e 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -11,8 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gta02" MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi" -MACHINE_EXTRA_RDEPENDS = "alsa-state" - # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-bt \ @@ -26,9 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-soc-smdk2440 \ kernel-module-nls-iso8859-1 \ kernel-module-nls-cp437 \ - \ - alsa-state \ - alsa-states \ " SERIAL_CONSOLE = "115200 ttySAC2" |