Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/kernel
This commit is contained in:
commit
84e9ccb666
@ -1 +0,0 @@
|
||||
CONFIG_THUNDERBOLT_NET=m
|
@ -1511,7 +1511,7 @@ CONFIG_EEPROM_MAX6875=m
|
||||
# CONFIG_EFI_FAKE_MEMMAP is not set
|
||||
CONFIG_EFI_PARTITION=y
|
||||
CONFIG_EFI_PGT_DUMP=y
|
||||
CONFIG_EFI_RCI2_TABLE=y
|
||||
# CONFIG_EFI_RCI2_TABLE is not set
|
||||
CONFIG_EFI_RUNTIME_MAP=y
|
||||
CONFIG_EFI_SOFT_RESERVE=y
|
||||
CONFIG_EFI_STUB=y
|
||||
@ -5926,7 +5926,6 @@ CONFIG_THINKPAD_ACPI=m
|
||||
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
|
||||
CONFIG_THINKPAD_ACPI_VIDEO=y
|
||||
CONFIG_THRUSTMASTER_FF=y
|
||||
CONFIG_THUNDERBOLT_NET=m
|
||||
# CONFIG_TI_ADC081C is not set
|
||||
# CONFIG_TI_ADC0832 is not set
|
||||
# CONFIG_TI_ADC084S021 is not set
|
||||
|
@ -1502,7 +1502,7 @@ CONFIG_EEPROM_MAX6875=m
|
||||
# CONFIG_EFI_FAKE_MEMMAP is not set
|
||||
CONFIG_EFI_PARTITION=y
|
||||
# CONFIG_EFI_PGT_DUMP is not set
|
||||
CONFIG_EFI_RCI2_TABLE=y
|
||||
# CONFIG_EFI_RCI2_TABLE is not set
|
||||
CONFIG_EFI_RUNTIME_MAP=y
|
||||
CONFIG_EFI_SOFT_RESERVE=y
|
||||
CONFIG_EFI_STUB=y
|
||||
@ -5905,7 +5905,6 @@ CONFIG_THINKPAD_ACPI=m
|
||||
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
|
||||
CONFIG_THINKPAD_ACPI_VIDEO=y
|
||||
CONFIG_THRUSTMASTER_FF=y
|
||||
CONFIG_THUNDERBOLT_NET=m
|
||||
# CONFIG_TI_ADC081C is not set
|
||||
# CONFIG_TI_ADC0832 is not set
|
||||
# CONFIG_TI_ADC084S021 is not set
|
||||
|
@ -5981,7 +5981,6 @@ CONFIG_THINKPAD_ACPI=m
|
||||
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
|
||||
CONFIG_THINKPAD_ACPI_VIDEO=y
|
||||
CONFIG_THRUSTMASTER_FF=y
|
||||
CONFIG_THUNDERBOLT_NET=m
|
||||
# CONFIG_TI_ADC081C is not set
|
||||
# CONFIG_TI_ADC0832 is not set
|
||||
# CONFIG_TI_ADC084S021 is not set
|
||||
|
@ -5960,7 +5960,6 @@ CONFIG_THINKPAD_ACPI=m
|
||||
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
|
||||
CONFIG_THINKPAD_ACPI_VIDEO=y
|
||||
CONFIG_THRUSTMASTER_FF=y
|
||||
CONFIG_THUNDERBOLT_NET=m
|
||||
# CONFIG_TI_ADC081C is not set
|
||||
# CONFIG_TI_ADC0832 is not set
|
||||
# CONFIG_TI_ADC084S021 is not set
|
||||
|
Loading…
Reference in New Issue
Block a user