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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-ppc
/
ocp.h
diff --git
a/include/asm-ppc/ocp.h
b/include/asm-ppc/ocp.h
index
b98db3c
..
16dbc7d
100644
(file)
--- a/
include/asm-ppc/ocp.h
+++ b/
include/asm-ppc/ocp.h
@@
-26,8
+26,6
@@
#include <linux/init.h>
#include <linux/list.h>
#include <linux/init.h>
#include <linux/list.h>
-#include <linux/config.h>
-#include <linux/devfs_fs_kernel.h>
#include <linux/device.h>
#include <asm/mmu.h>
#include <linux/device.h>
#include <asm/mmu.h>
@@
-189,7
+187,7
@@
extern void ocp_for_each_device(void(*callback)(struct ocp_device *, void *arg),
/* Sysfs support */
#define OCP_SYSFS_ADDTL(type, format, name, field) \
static ssize_t \
/* Sysfs support */
#define OCP_SYSFS_ADDTL(type, format, name, field) \
static ssize_t \
-show_##name##_##field(struct device *dev,
char *buf)
\
+show_##name##_##field(struct device *dev,
struct device_attribute *attr, char *buf)
\
{ \
struct ocp_device *odev = to_ocp_dev(dev); \
type *add = odev->def->additions; \
{ \
struct ocp_device *odev = to_ocp_dev(dev); \
type *add = odev->def->additions; \
@@
-202,10
+200,6
@@
static DEVICE_ATTR(name##_##field, S_IRUGO, show_##name##_##field, NULL);
#include <asm/ibm_ocp.h>
#endif
#include <asm/ibm_ocp.h>
#endif
-#ifdef CONFIG_FSL_OCP
-#include <asm/fsl_ocp.h>
-#endif
-
#endif /* CONFIG_PPC_OCP */
#endif /* __OCP_H__ */
#endif /* __KERNEL__ */
#endif /* CONFIG_PPC_OCP */
#endif /* __OCP_H__ */
#endif /* __KERNEL__ */