Changeset 5387807 in mainline for uspace/srv/hid/fb/main.c

Timestamp:

2010-06-17T20:58:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8ef40329

Parents:

d0c82c5 (diff), 3193c05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge progress from the ia64-revival branch.

File:

• uspace/srv/hid/fb/main.c (modified) (1 diff)

uspace/srv/hid/fb/main.c

@@ -105 +105 @@
 #endif
 #ifdef SKI_ENABLED
-        if ((!initialized) && (!fb_present)) {
+        if ((!initialized) && (fb_kind == 6)) {
                 if (ski_init() == 0)
                         initialized = true;