mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 17:27:14 +08:00 
			
		
		
		
	Merge branch 'master' into microsoft/surface/kernel-6.6
This commit is contained in:
		@@ -7,14 +7,15 @@ let
 | 
			
		||||
 | 
			
		||||
  cfg = config.microsoft-surface;
 | 
			
		||||
 | 
			
		||||
  version = "6.6.10";
 | 
			
		||||
  version = "6.6.13";
 | 
			
		||||
  kernelPatches = surfacePatches {
 | 
			
		||||
    inherit version;
 | 
			
		||||
    patchFn = ./patches.nix;
 | 
			
		||||
  };
 | 
			
		||||
  kernelPackages = linuxPackage2 {
 | 
			
		||||
    inherit version kernelPatches;
 | 
			
		||||
    sha256 = "sha256-nuYn5MEJrsf8o+2liY6B0gGvLH6y99nX2UwfDhIFVGw=";
 | 
			
		||||
    sha256 = "sha256-iLiefdQerU46seQRyLuNWSV1rPgVzx3zwNxX4uiCwLw=";
 | 
			
		||||
    ignoreConfigErrors=true;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
in {
 | 
			
		||||
 
 | 
			
		||||
@@ -8,10 +8,12 @@
 | 
			
		||||
  {
 | 
			
		||||
    name = "microsoft-surface-patches-linux-${version}";
 | 
			
		||||
    patch = null;
 | 
			
		||||
    structuredExtraConfig = with kernel; {
 | 
			
		||||
      ##
 | 
			
		||||
      ## Surface Aggregator Module
 | 
			
		||||
      ##
 | 
			
		||||
    extraStructuredConfig = with kernel; {
 | 
			
		||||
      STAGING_MEDIA = yes;
 | 
			
		||||
 | 
			
		||||
      #
 | 
			
		||||
      # Surface Aggregator Module
 | 
			
		||||
      #
 | 
			
		||||
      SURFACE_AGGREGATOR = module;
 | 
			
		||||
      # SURFACE_AGGREGATOR_ERROR_INJECTION is not set
 | 
			
		||||
      SURFACE_AGGREGATOR_BUS = yes;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user