merge mainline into keylayouts
This commit is contained in:
		
						commit
						fea90138d5
					
				
					 38 changed files with 2070 additions and 655 deletions
				
			
		|  | @ -39,6 +39,7 @@ extern void grub_gfxterm_init (void); | |||
| extern void grub_at_keyboard_init (void); | ||||
| extern void grub_serial_init (void); | ||||
| extern void grub_terminfo_init (void); | ||||
| extern void grub_keylayouts_init (void); | ||||
| 
 | ||||
| /* FIXME: use interrupt to count high.  */ | ||||
| grub_uint64_t | ||||
|  | @ -205,6 +206,7 @@ grub_machine_init (void) | |||
|   grub_font_init (); | ||||
|   grub_gfxterm_init (); | ||||
| 
 | ||||
|   grub_keylayouts_init (); | ||||
|   grub_at_keyboard_init (); | ||||
| 
 | ||||
|   grub_terminfo_init (); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue