diff options
author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/ppc | |
parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8260_io/enet.c | 4 | ||||
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 4 | ||||
-rw-r--r-- | arch/ppc/kernel/ppc_htab.c | 1 | ||||
-rw-r--r-- | arch/ppc/kernel/vmlinux.lds.S | 8 | ||||
-rw-r--r-- | arch/ppc/platforms/katana.c | 21 | ||||
-rw-r--r-- | arch/ppc/syslib/mv64x60.c | 1 | ||||
-rw-r--r-- | arch/ppc/syslib/open_pic.c | 2 | ||||
-rw-r--r-- | arch/ppc/syslib/open_pic2.c | 2 |
8 files changed, 10 insertions, 33 deletions
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index 3ea4db2cc9e..25ef55bacd9 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c | |||
@@ -272,7 +272,7 @@ scc_enet_timeout(struct net_device *dev) | |||
272 | * This is called from the CPM handler, not the MPC core interrupt. | 272 | * This is called from the CPM handler, not the MPC core interrupt. |
273 | */ | 273 | */ |
274 | static irqreturn_t | 274 | static irqreturn_t |
275 | scc_enet_interrupt(int irq, void * dev_id) | 275 | scc_enet_interrupt(int irq, void *dev_id) |
276 | { | 276 | { |
277 | struct net_device *dev = dev_id; | 277 | struct net_device *dev = dev_id; |
278 | volatile struct scc_enet_private *cep; | 278 | volatile struct scc_enet_private *cep; |
@@ -280,7 +280,7 @@ scc_enet_interrupt(int irq, void * dev_id) | |||
280 | ushort int_events; | 280 | ushort int_events; |
281 | int must_restart; | 281 | int must_restart; |
282 | 282 | ||
283 | cep = (struct scc_enet_private *)dev->priv; | 283 | cep = dev->priv; |
284 | 284 | ||
285 | /* Get the interrupt events that caused us to be here. | 285 | /* Get the interrupt events that caused us to be here. |
286 | */ | 286 | */ |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index 6f3ed6a72e0..a3a27dafff1 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev) | |||
524 | 524 | ||
525 | /* The interrupt handler. */ | 525 | /* The interrupt handler. */ |
526 | static irqreturn_t | 526 | static irqreturn_t |
527 | fcc_enet_interrupt(int irq, void * dev_id) | 527 | fcc_enet_interrupt(int irq, void *dev_id) |
528 | { | 528 | { |
529 | struct net_device *dev = dev_id; | 529 | struct net_device *dev = dev_id; |
530 | volatile struct fcc_enet_private *cep; | 530 | volatile struct fcc_enet_private *cep; |
@@ -532,7 +532,7 @@ fcc_enet_interrupt(int irq, void * dev_id) | |||
532 | ushort int_events; | 532 | ushort int_events; |
533 | int must_restart; | 533 | int must_restart; |
534 | 534 | ||
535 | cep = (struct fcc_enet_private *)dev->priv; | 535 | cep = dev->priv; |
536 | 536 | ||
537 | /* Get the interrupt events that caused us to be here. | 537 | /* Get the interrupt events that caused us to be here. |
538 | */ | 538 | */ |
diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c index aa07b63c0a6..9ed36dd9cbf 100644 --- a/arch/ppc/kernel/ppc_htab.c +++ b/arch/ppc/kernel/ppc_htab.c | |||
@@ -436,7 +436,6 @@ int proc_dol2crvec(ctl_table *table, int write, struct file *filp, | |||
436 | */ | 436 | */ |
437 | static ctl_table htab_ctl_table[]={ | 437 | static ctl_table htab_ctl_table[]={ |
438 | { | 438 | { |
439 | .ctl_name = KERN_PPC_L2CR, | ||
440 | .procname = "l2cr", | 439 | .procname = "l2cr", |
441 | .mode = 0644, | 440 | .mode = 0644, |
442 | .proc_handler = &proc_dol2crvec, | 441 | .proc_handler = &proc_dol2crvec, |
diff --git a/arch/ppc/kernel/vmlinux.lds.S b/arch/ppc/kernel/vmlinux.lds.S index 98c1212674f..52b64fcbdfc 100644 --- a/arch/ppc/kernel/vmlinux.lds.S +++ b/arch/ppc/kernel/vmlinux.lds.S | |||
@@ -97,14 +97,14 @@ SECTIONS | |||
97 | __init_begin = .; | 97 | __init_begin = .; |
98 | .init.text : { | 98 | .init.text : { |
99 | _sinittext = .; | 99 | _sinittext = .; |
100 | *(.init.text) | 100 | INIT_TEXT |
101 | _einittext = .; | 101 | _einittext = .; |
102 | } | 102 | } |
103 | /* .exit.text is discarded at runtime, not link time, | 103 | /* .exit.text is discarded at runtime, not link time, |
104 | to deal with references from __bug_table */ | 104 | to deal with references from __bug_table */ |
105 | .exit.text : { *(.exit.text) } | 105 | .exit.text : { EXIT_TEXT } |
106 | .init.data : { | 106 | .init.data : { |
107 | *(.init.data); | 107 | INIT_DATA |
108 | __vtop_table_begin = .; | 108 | __vtop_table_begin = .; |
109 | *(.vtop_fixup); | 109 | *(.vtop_fixup); |
110 | __vtop_table_end = .; | 110 | __vtop_table_end = .; |
@@ -164,6 +164,6 @@ SECTIONS | |||
164 | /* Sections to be discarded. */ | 164 | /* Sections to be discarded. */ |
165 | /DISCARD/ : { | 165 | /DISCARD/ : { |
166 | *(.exitcall.exit) | 166 | *(.exitcall.exit) |
167 | *(.exit.data) | 167 | EXIT_DATA |
168 | } | 168 | } |
169 | } | 169 | } |
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c index 52f63e6f085..fe6e88cdb1c 100644 --- a/arch/ppc/platforms/katana.c +++ b/arch/ppc/platforms/katana.c | |||
@@ -838,27 +838,6 @@ katana_find_end_of_memory(void) | |||
838 | return bdp->bi_memsize; | 838 | return bdp->bi_memsize; |
839 | } | 839 | } |
840 | 840 | ||
841 | #if defined(CONFIG_I2C_MV64XXX) && defined(CONFIG_SENSORS_M41T00) | ||
842 | extern ulong m41t00_get_rtc_time(void); | ||
843 | extern int m41t00_set_rtc_time(ulong); | ||
844 | |||
845 | static int __init | ||
846 | katana_rtc_hookup(void) | ||
847 | { | ||
848 | struct timespec tv; | ||
849 | |||
850 | ppc_md.get_rtc_time = m41t00_get_rtc_time; | ||
851 | ppc_md.set_rtc_time = m41t00_set_rtc_time; | ||
852 | |||
853 | tv.tv_nsec = 0; | ||
854 | tv.tv_sec = (ppc_md.get_rtc_time)(); | ||
855 | do_settimeofday(&tv); | ||
856 | |||
857 | return 0; | ||
858 | } | ||
859 | late_initcall(katana_rtc_hookup); | ||
860 | #endif | ||
861 | |||
862 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) && defined(CONFIG_SERIAL_MPSC_CONSOLE) | 841 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) && defined(CONFIG_SERIAL_MPSC_CONSOLE) |
863 | static void __init | 842 | static void __init |
864 | katana_map_io(void) | 843 | katana_map_io(void) |
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c index 2744b8a6f66..90fe904d361 100644 --- a/arch/ppc/syslib/mv64x60.c +++ b/arch/ppc/syslib/mv64x60.c | |||
@@ -411,7 +411,6 @@ static struct mv64xxx_i2c_pdata mv64xxx_i2c_pdata = { | |||
411 | .freq_m = 8, | 411 | .freq_m = 8, |
412 | .freq_n = 3, | 412 | .freq_n = 3, |
413 | .timeout = 1000, /* Default timeout of 1 second */ | 413 | .timeout = 1000, /* Default timeout of 1 second */ |
414 | .retries = 1, | ||
415 | }; | 414 | }; |
416 | 415 | ||
417 | static struct resource mv64xxx_i2c_resources[] = { | 416 | static struct resource mv64xxx_i2c_resources[] = { |
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c index 780a3b9b4fe..67dffe27b5c 100644 --- a/arch/ppc/syslib/open_pic.c +++ b/arch/ppc/syslib/open_pic.c | |||
@@ -1043,7 +1043,7 @@ int openpic_resume(struct sys_device *sysdev) | |||
1043 | #endif /* CONFIG_PM */ | 1043 | #endif /* CONFIG_PM */ |
1044 | 1044 | ||
1045 | static struct sysdev_class openpic_sysclass = { | 1045 | static struct sysdev_class openpic_sysclass = { |
1046 | set_kset_name("openpic"), | 1046 | .name = "openpic", |
1047 | }; | 1047 | }; |
1048 | 1048 | ||
1049 | static struct sys_device device_openpic = { | 1049 | static struct sys_device device_openpic = { |
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c index d585207f9f7..449075a0479 100644 --- a/arch/ppc/syslib/open_pic2.c +++ b/arch/ppc/syslib/open_pic2.c | |||
@@ -666,7 +666,7 @@ int openpic2_resume(struct sys_device *sysdev) | |||
666 | 666 | ||
667 | /* HACK ALERT */ | 667 | /* HACK ALERT */ |
668 | static struct sysdev_class openpic2_sysclass = { | 668 | static struct sysdev_class openpic2_sysclass = { |
669 | set_kset_name("openpic2"), | 669 | .name = "openpic2", |
670 | }; | 670 | }; |
671 | 671 | ||
672 | static struct sys_device device_openpic2 = { | 672 | static struct sys_device device_openpic2 = { |