From 2fdb3fc0b67757afd6fe7a244b6e14d2a546af0e Mon Sep 17 00:00:00 2001
From: graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Date: Tue, 08 Dec 2009 20:20:03 -0500
Subject: Merge commit 'grg' into HEAD

git-svn-id: http://opkg.googlecode.com/svn/trunk@471 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
---
(limited to 'libopkg/opkg_install.h')

diff --git a/libopkg/opkg_install.h b/libopkg/opkg_install.h
index 13d43d0..eaffff8 100644
--- a/libopkg/opkg_install.h
+++ b/libopkg/opkg_install.h
@@ -20,9 +20,8 @@
 
 #include "pkg.h"
 #include "opkg_conf.h"
-#include "opkg_error.h"
 
-int opkg_install_by_name(opkg_conf_t *conf, const char *pkg_name);
-int opkg_install_pkg(opkg_conf_t *conf, pkg_t *pkg, int from_upgrading);
+int opkg_install_by_name(const char *pkg_name);
+int opkg_install_pkg(pkg_t *pkg, int from_upgrading);
 
 #endif
--
cgit v0.9.1