diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-22 20:32:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-22 20:32:30 -0700 |
| commit | c06fd892405fbedfbf4572a2f8d5df2721a86937 (patch) | |
| tree | 151261d939cae8b5d99795baf313c26a6b2a28c3 /kernel | |
| parent | a8c7db206bff26cf6bc45df39024bd33799732df (diff) | |
| parent | 414470416cd233c163462b1fef225988595e84c8 (diff) | |
Merge http://linux-isdn.bkbits.net/linux-2.5.make
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/ksyms.c | 1 | ||||
| -rw-r--r-- | kernel/suspend.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/kernel/ksyms.c b/kernel/ksyms.c index 20c26b93f405..557ae8f7ded2 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -335,7 +335,6 @@ EXPORT_SYMBOL(tty_unregister_driver); EXPORT_SYMBOL(tty_std_termios); /* block device driver support */ -EXPORT_SYMBOL(blk_size); EXPORT_SYMBOL(blk_dev); EXPORT_SYMBOL(bdev_read_only); EXPORT_SYMBOL(set_device_ro); diff --git a/kernel/suspend.c b/kernel/suspend.c index 419490900ff6..a83365417d28 100644 --- a/kernel/suspend.c +++ b/kernel/suspend.c @@ -81,7 +81,6 @@ unsigned char software_suspend_enabled = 0; #define TIMEOUT (6 * HZ) /* Timeout for stopping processes */ #define ADDRESS(x) ((unsigned long) phys_to_virt(((x) << PAGE_SHIFT))) -extern void wakeup_bdflush(void); extern int C_A_D; /* References to section boundaries */ |