diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/s390/cio/cio.h | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'drivers/s390/cio/cio.h')
| -rw-r--r-- | drivers/s390/cio/cio.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h index 3c75412904dc..6e933aebe013 100644 --- a/drivers/s390/cio/cio.h +++ b/drivers/s390/cio/cio.h | |||
| @@ -118,6 +118,4 @@ extern void *cio_get_console_priv(void); | |||
| 118 | #define cio_get_console_priv() NULL | 118 | #define cio_get_console_priv() NULL |
| 119 | #endif | 119 | #endif |
| 120 | 120 | ||
| 121 | extern int cio_show_msg; | ||
| 122 | |||
| 123 | #endif | 121 | #endif |