git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
macintosh
/
macio_sysfs.c
diff --git
a/drivers/macintosh/macio_sysfs.c
b/drivers/macintosh/macio_sysfs.c
index
7f7d4ea
..
8566bdf
100644
(file)
--- a/
drivers/macintosh/macio_sysfs.c
+++ b/
drivers/macintosh/macio_sysfs.c
@@
-1,4
+1,3
@@
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/stat.h>
#include <asm/macio.h>
#include <linux/kernel.h>
#include <linux/stat.h>
#include <asm/macio.h>
@@
-17,12
+16,12
@@
static ssize_t
compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
{
struct of_device *of;
compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
{
struct of_device *of;
- char *compat;
+ c
onst c
har *compat;
int cplen;
int length = 0;
of = &to_macio_device (dev)->ofdev;
int cplen;
int length = 0;
of = &to_macio_device (dev)->ofdev;
- compat =
(char *)
get_property(of->node, "compatible", &cplen);
+ compat = get_property(of->node, "compatible", &cplen);
if (!compat) {
*buf = '\0';
return 0;
if (!compat) {
*buf = '\0';
return 0;
@@
-43,12
+42,12
@@
static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
char *buf)
{
struct of_device *of;
char *buf)
{
struct of_device *of;
- char *compat;
+ c
onst c
har *compat;
int cplen;
int length;
of = &to_macio_device (dev)->ofdev;
int cplen;
int length;
of = &to_macio_device (dev)->ofdev;
- compat =
(char *) get_property
(of->node, "compatible", &cplen);
+ compat =
get_property
(of->node, "compatible", &cplen);
if (!compat) compat = "", cplen = 1;
length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
buf += length;
if (!compat) compat = "", cplen = 1;
length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
buf += length;