diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /drivers/atm/iphase.c | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
| download | op-kernel-dev-478c6a43fcbc6c11609f8cee7c7b57223907754f.zip op-kernel-dev-478c6a43fcbc6c11609f8cee7c7b57223907754f.tar.gz | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/atm/iphase.c')
| -rw-r--r-- | drivers/atm/iphase.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index e1c7611..78c9736 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -977,9 +977,7 @@ static void xdump( u_char* cp, int length, char* prefix ) else pBuf += sprintf( pBuf, "." ); } - sprintf( pBuf, "\n" ); - // SPrint(prntBuf); - printk(prntBuf); + printk("%s\n", prntBuf); count += col; pBuf = prntBuf; } |
