summaryrefslogtreecommitdiff
path: root/include/linux/pps_kernel.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-09-19 18:46:43 +0200
committerTakashi Iwai <tiwai@suse.de>2013-09-19 18:46:43 +0200
commit43cdd088b1b10306d4eb6d9208b62c7f60abffeb (patch)
tree8dd799379a241c1b47b736299c306eb77f06e6ff /include/linux/pps_kernel.h
parentbf69aa906ccddacc9e966794869431374953738a (diff)
parent4028b6c4c03f213260e9290ff3a6b5439aad07ce (diff)
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux/pps_kernel.h')
-rw-r--r--include/linux/pps_kernel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h
index 7db3eb93a079..1d2cd21242e8 100644
--- a/include/linux/pps_kernel.h
+++ b/include/linux/pps_kernel.h
@@ -80,7 +80,7 @@ struct pps_device {
* Global variables
*/
-extern struct device_attribute pps_attrs[];
+extern const struct attribute_group *pps_groups[];
/*
* Internal functions.