diff --git a/bsp/fri2/fri2-standard.scc b/bsp/fri2/fri2-standard.scc index a42f1b5a08c022d79a73f1284732e27e7babe53c..8205135d17b9ad37a444ad1e4102ee9620b1933f 100644 --- a/bsp/fri2/fri2-standard.scc +++ b/bsp/fri2/fri2-standard.scc @@ -5,7 +5,7 @@ define KARCH i386 include ktypes/standard branch fri2 -git merge emgd-1.10 +git merge emgd-1.14 include fri2.scc include cfg/efi-ext.scc