---

yaml --- r: 288953 b: refs/heads/master c: 7267d26 h: refs/heads/master i: 288951: fbdd550 v: v3
git-mirror · Feb 9, 2012 · b32d707 · b32d707
1 parent 3dc7d77
commit b32d707
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c9ed5bedf973ab7f4e428f7418d1e72ba3bcbe4
+refs/heads/master: 7267d2610a7ed3f56a1f20f58b9ee0d944025b01
diff --git a/trunk/drivers/staging/quickstart/quickstart.c b/trunk/drivers/staging/quickstart/quickstart.c
@@ -92,19 +92,19 @@ static struct acpi_driver quickstart_acpi_driver = {
 struct input_dev *quickstart_input;
 
 /* Platform driver structs */
-static ssize_t buttons_show(struct device *dev,
+static ssize_t quickstart_buttons_show(struct device *dev,
 					struct device_attribute *attr,
 					char *buf);
-static ssize_t pressed_button_show(struct device *dev,
+static ssize_t quickstart_pressed_button_show(struct device *dev,
 					struct device_attribute *attr,
 					char *buf);
-static ssize_t pressed_button_store(struct device *dev,
+static ssize_t quickstart_pressed_button_store(struct device *dev,
 					struct device_attribute *attr,
 					 const char *buf,
 					 size_t count);
-static DEVICE_ATTR(pressed_button, 0666, pressed_button_show,
-					 pressed_button_store);
-static DEVICE_ATTR(buttons, 0444, buttons_show, NULL);
+static DEVICE_ATTR(pressed_button, 0666, quickstart_pressed_button_show,
+					 quickstart_pressed_button_store);
+static DEVICE_ATTR(buttons, 0444, quickstart_buttons_show, NULL);
 static struct platform_device *pf_device;
 static struct platform_driver pf_driver = {
 	.driver = {
@@ -114,7 +114,7 @@ static struct platform_driver pf_driver = {
 };
 
 /* Platform driver functions */
-static ssize_t buttons_show(struct device *dev,
+static ssize_t quickstart_buttons_show(struct device *dev,
 					struct device_attribute *attr,
 					char *buf)
 {
@@ -136,7 +136,7 @@ static ssize_t buttons_show(struct device *dev,
 	return count;
 }
 
-static ssize_t pressed_button_show(struct device *dev,
+static ssize_t quickstart_pressed_button_show(struct device *dev,
 						struct device_attribute *attr,
 						char *buf)
 {
@@ -146,7 +146,7 @@ static ssize_t pressed_button_show(struct device *dev,
 }
 
 
-static ssize_t pressed_button_store(struct device *dev,
+static ssize_t quickstart_pressed_button_store(struct device *dev,
 						struct device_attribute *attr,
 						const char *buf, size_t count)
 {