diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-10 00:21:11 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-10 00:23:17 -0700 |
commit | caafc71b1a25096ef74904adb19d37e5c6a282dc (patch) | |
tree | 17f0602c6e04fdec78c50a1c2cbd70a0303ed2c6 /drivers/platform/x86/dell-laptop.c | |
parent | af568679f51de779d0e9ad7d8360dc7727da546d (diff) | |
parent | bcd59b0f0c14b0584c1213ee3b53d5f84517c419 (diff) | |
download | blackbird-op-linux-caafc71b1a25096ef74904adb19d37e5c6a282dc.tar.gz blackbird-op-linux-caafc71b1a25096ef74904adb19d37e5c6a282dc.zip |
Merge tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers
DaVinci SoC updates for v3.5
This pull request updates the DaVinci SoC support to implement DEBUG_LL port
choice and optimizes the DMA ISR by removing unnecessary register reads.
* tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: optimize the DMA ISR
ARM: davinci: implement DEBUG_LL port choice
+ sync with Linux 3.4-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/platform/x86/dell-laptop.c')
-rw-r--r-- | drivers/platform/x86/dell-laptop.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index a05fc9c955d8..e6c08ee8d46c 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -212,6 +212,7 @@ static struct dmi_system_id __devinitdata dell_quirks[] = { }, .driver_data = &quirk_dell_vostro_v130, }, + { } }; static struct calling_interface_buffer *buffer; |