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]
/
drivers
/
net
/
ibm_emac
/
ibm_emac_debug.c
diff --git
a/drivers/net/ibm_emac/ibm_emac_debug.c
b/drivers/net/ibm_emac/ibm_emac_debug.c
index
75d3b86
..
92f970d
100644
(file)
--- a/
drivers/net/ibm_emac/ibm_emac_debug.c
+++ b/
drivers/net/ibm_emac/ibm_emac_debug.c
@@
-12,7
+12,6
@@
* option) any later version.
*
*/
* option) any later version.
*
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
@@
-58,7
+57,7
@@
static void emac_desc_dump(int idx, struct ocp_enet_private *p)
static void emac_mac_dump(int idx, struct ocp_enet_private *dev)
{
static void emac_mac_dump(int idx, struct ocp_enet_private *dev)
{
- struct emac_regs *p = dev->emacp;
+ struct emac_regs
__iomem
*p = dev->emacp;
printk("** EMAC%d registers **\n"
"MR0 = 0x%08x MR1 = 0x%08x TMR0 = 0x%08x TMR1 = 0x%08x\n"
printk("** EMAC%d registers **\n"
"MR0 = 0x%08x MR1 = 0x%08x TMR0 = 0x%08x TMR1 = 0x%08x\n"
@@
-180,8
+179,7
@@
void emac_dbg_dump_all(void)
}
#if defined(CONFIG_MAGIC_SYSRQ)
}
#if defined(CONFIG_MAGIC_SYSRQ)
-static void emac_sysrq_handler(int key, struct pt_regs *pt_regs,
- struct tty_struct *tty)
+static void emac_sysrq_handler(int key, struct tty_struct *tty)
{
emac_dbg_dump_all();
}
{
emac_dbg_dump_all();
}