Changeset 965dc18 in mainline for kernel/arch/sparc64/include/drivers

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

Location:

kernel/arch/sparc64/include/drivers

Files:

• kbd.h (modified) (1 diff)
• scr.h (modified) (1 diff)
• sgcn.h (added)

kernel/arch/sparc64/include/drivers/kbd.h

@@ -42 +42 @@
         KBD_UNKNOWN,
         KBD_Z8530,
-        KBD_NS16550
+        KBD_NS16550,
+        KBD_SGCN
 } kbd_type_t;
 

kernel/arch/sparc64/include/drivers/scr.h

@@ -43 +43 @@
         SCR_ATYFB,
         SCR_FFB,
-        SCR_CGSIX
+        SCR_CGSIX,
+        SCR_XVR
 } scr_type_t;