diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-09-10 15:44:58 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-09-10 15:44:58 +0000 |
| commit | 496383e73baaaeae20a3e8c21785e9ef66182899 (patch) | |
| tree | 05a34001a4ca8d33b79bc5d47ba74100ddf0a8fb /conf | |
| parent | 191ea8a90af26ee5c0b3c07ad7a2fb28d179cc84 (diff) | |
| parent | 1e807f3e9d554d0f8db7f240a1a7a42420f8571e (diff) | |
merge of '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'
and 'bc1bceb6bfab051d162269a77df02ea351b62358'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 1 | ||||
| -rw-r--r-- | conf/machine/rokre6.conf | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 3b2dcce756..017dc51cba 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -320,6 +320,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5" require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions.inc +require conf/distro/include/preferred-openmoko-versions.inc # Virtuals: diff --git a/conf/machine/rokre6.conf b/conf/machine/rokre6.conf new file mode 100644 index 0000000000..7b20091140 --- /dev/null +++ b/conf/machine/rokre6.conf @@ -0,0 +1,8 @@ +#@TYPE: Machine +#@NAME: Motorola EZX ROKR E6 +#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E6 + +require conf/machine/include/motorola-ezx-base.inc + +# there is no touchscreen +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen" |