← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/input/touchscreen/pcap_ts.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/input/touchscreen/pcap_ts.c
14
14
#include <linux/init.h>
15
15
#include <linux/fs.h>
16
16
#include <linux/string.h>
 
17
#include <linux/slab.h>
17
18
#include <linux/pm.h>
18
19
#include <linux/timer.h>
19
20
#include <linux/interrupt.h>
233
234
        return 0;
234
235
}
235
236
 
236
 
static struct dev_pm_ops pcap_ts_pm_ops = {
 
237
static const struct dev_pm_ops pcap_ts_pm_ops = {
237
238
        .suspend        = pcap_ts_suspend,
238
239
        .resume         = pcap_ts_resume,
239
240
};