summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2011-12-28 22:38:10 +0000
committerThomas Backlund <tmb@mageia.org>2011-12-28 22:38:10 +0000
commit9f64990530e6bf4e25063e50387d7b2d94aa24ff (patch)
tree0f7cc2b7c040c6d8c7a49b52652b9e2cfb0c9b16
parentb7d8250f2ec3bec83f673be9e5b56974e4795b30 (diff)
downloaddrakx-9f64990530e6bf4e25063e50387d7b2d94aa24ff.tar
drakx-9f64990530e6bf4e25063e50387d7b2d94aa24ff.tar.gz
drakx-9f64990530e6bf4e25063e50387d7b2d94aa24ff.tar.bz2
drakx-9f64990530e6bf4e25063e50387d7b2d94aa24ff.tar.xz
drakx-9f64990530e6bf4e25063e50387d7b2d94aa24ff.zip
(handle_pcmcia) kill obsolete test for 2.2 kernel (patch from tv)
-rw-r--r--mdk-stage1/NEWS1
-rw-r--r--mdk-stage1/stage1.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 0a4324530..57d117b7f 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,4 @@
+- (handle_pcmcia) kill obsolete test for 2.2 kernel (tv)
- sync with kernel-3.2.0-0.rc7.1.mga2 for updated list_modules.pm
1.54:
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 47473e9d7..14d28e111 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -219,10 +219,6 @@ static void spawn_interactive(void)
static void handle_pcmcia(void)
{
char * pcmcia_adapter;
- if (kernel_version() == 2) {
- stg1_error_message("We now use kernel pcmcia support and this won't work with a 2.2 kernel.");
- return;
- }
pcmcia_adapter = pcmcia_probe();
if (!pcmcia_adapter) {