xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:

	drivers/usb/input/hid.h
This commit is contained in:
Dmitry Torokhov
2006-12-08 01:07:56 -05:00
parent 4bdbd2807d c99767974e
commit bef986502f
4033 changed files with 157167 additions and 79875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/touchscreen/ads7846.c
View File

@@ -190,7 +190,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
{
struct spi_device *spi = to_spi_device(dev);
struct ads7846 *ts = dev_get_drvdata(dev);
struct ser_req *req = kzalloc(sizeof *req, SLAB_KERNEL);
struct ser_req *req = kzalloc(sizeof *req, GFP_KERNEL);
int status;
int sample;
int i;