diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-28 11:15:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-28 11:15:36 -0700 |
| commit | c89b857ce6d803905b2c9d71bc9effdd286c45ed (patch) | |
| tree | 6cf4a6e23f68f3b65906210dccb272ab2f9c5c74 /drivers/firmware | |
| parent | 2e34b429a404675dc4fc4ad2ee339eea028da3ca (diff) | |
| parent | 663dd6dcaf7e95526e469e91f41972a9c0cca30c (diff) | |
| download | blackbird-op-linux-c89b857ce6d803905b2c9d71bc9effdd286c45ed.tar.gz blackbird-op-linux-c89b857ce6d803905b2c9d71bc9effdd286c45ed.zip | |
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
Connector: Correctly set the error code in case of success when dispatching receive callbacks
Connector: Set the CN_NETLINK_USERS correctly
pti: PTI semantics fix in pti_tty_cleanup.
pti: ENXIO error case memory leak PTI fix.
pti: double-free security PTI fix
drivers:misc: ti-st: fix skipping of change remote baud
drivers/base/platform.c: don't mark platform_device_register_resndata() as __init_or_module
st_kim: Handle case of no device found for ID 0
firmware: fix GOOGLE_SMI kconfig dependency warning
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/google/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/google/Kconfig index 87096b6ca5c9..2f21b0bfe653 100644 --- a/drivers/firmware/google/Kconfig +++ b/drivers/firmware/google/Kconfig @@ -13,6 +13,7 @@ menu "Google Firmware Drivers" config GOOGLE_SMI tristate "SMI interface for Google platforms" depends on ACPI && DMI + select EFI select EFI_VARS help Say Y here if you want to enable SMI callbacks for Google |
