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

Timestamp:

2011-08-07T11:21:44Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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 mainline changes.

File:

• uspace/srv/hid/fb/main.c (modified) (2 diffs)

uspace/srv/hid/fb/main.c

@@ -40 +40 @@
 #include "msim.h"
 #include "ski.h"
-#include "sgcn.h"
 #include "niagara.h"
 #include "main.h"
@@ -92 +91 @@
         }
 #endif
-#ifdef SGCN_ENABLED
-        if ((!initialized) && (fb_kind == 4)) {
-                if (sgcn_init() == 0)
-                        initialized = true;
-        }
-#endif
 #ifdef NIAGARA_ENABLED
         if ((!initialized) && (fb_kind == 5)) {