diff --git a/[refs] b/[refs] index 3134b8c11557..fe2ec5c729cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b06bce772768640039bd0eea51c52935f8bc701a +refs/heads/master: a9253883a6d34fd5087ebc461e862613f38d72ec diff --git a/trunk/drivers/staging/xgifb/XGIfb.h b/trunk/drivers/staging/xgifb/XGIfb.h index 4c29cf043741..ef86a64d6996 100644 --- a/trunk/drivers/staging/xgifb/XGIfb.h +++ b/trunk/drivers/staging/xgifb/XGIfb.h @@ -205,9 +205,4 @@ struct video_info{ extern struct video_info xgi_video_info; -#ifdef __KERNEL__ -//extern void xgi_malloc(struct xgi_memreq *req); -extern void xgi_free(unsigned long base); -extern void xgi_dispinfo(struct ap_data *rec); -#endif #endif