Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 353656
b: refs/heads/master
c: fe7e913
h: refs/heads/master
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent dc459dc commit fb47345
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc14e209c9cb5f2a82424d7aac1f0c763c8e8e7b
refs/heads/master: fe7e913c717be913276469e13e25d9be2b1b3847
6 changes: 2 additions & 4 deletions trunk/drivers/platform/x86/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,9 @@ config ASUS_LAPTOP
If you have an ACPI-compatible ASUS laptop, say Y or M here.

config DELL_LAPTOP
tristate "Dell Laptop Extras (EXPERIMENTAL)"
tristate "Dell Laptop Extras"
depends on X86
depends on DCDBAS
depends on EXPERIMENTAL
depends on BACKLIGHT_CLASS_DEVICE
depends on RFKILL || RFKILL = n
depends on SERIO_I8042
Expand Down Expand Up @@ -171,9 +170,8 @@ config AMILO_RFKILL
laptops.

config TC1100_WMI
tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
tristate "HP Compaq TC1100 Tablet WMI Extras"
depends on !X86_64
depends on EXPERIMENTAL
depends on ACPI
depends on ACPI_WMI
---help---
Expand Down

0 comments on commit fb47345

Please sign in to comment.