From: Cornelia Huck <cornelia.huck@de.ibm.com>

Fix broken to_channelpath macro (fortunately worked in all current cases...).

Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/s390/cio/chsc.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/s390/cio/chsc.h~s390-fix-to_channelpath-macro drivers/s390/cio/chsc.h
--- 25/drivers/s390/cio/chsc.h~s390-fix-to_channelpath-macro	Thu Feb  2 16:25:48 2006
+++ 25-akpm/drivers/s390/cio/chsc.h	Thu Feb  2 16:25:48 2006
@@ -68,6 +68,6 @@ extern void *chsc_get_chp_desc(struct su
 
 extern int chsc_enable_facility(int);
 
-#define to_channelpath(dev) container_of(dev, struct channel_path, dev)
+#define to_channelpath(device) container_of(device, struct channel_path, dev)
 
 #endif
_