mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge 3.9-rc7 into driver-core-next
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
0d1d392f01
422 changed files with 4235 additions and 2523 deletions
|
|
@ -229,6 +229,8 @@ queue_store_##name(struct request_queue *q, const char *page, size_t count) \
|
|||
unsigned long val; \
|
||||
ssize_t ret; \
|
||||
ret = queue_var_store(&val, page, count); \
|
||||
if (ret < 0) \
|
||||
return ret; \
|
||||
if (neg) \
|
||||
val = !val; \
|
||||
\
|
||||
|
|
|
|||
|
|
@ -257,7 +257,6 @@ void delete_partition(struct gendisk *disk, int partno)
|
|||
|
||||
hd_struct_put(part);
|
||||
}
|
||||
EXPORT_SYMBOL(delete_partition);
|
||||
|
||||
static ssize_t whole_disk_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
|
|
|
|||
Loading…
Reference in a new issue